Some much needed cleanup