Some much much needed cleanup