Cleaning up unneeded

removed some merge artifacts..