Some much needed cleanup before this feature