Great work on cleaning those up