Clean up left over logic.