Some much-needed cleanup.