Fixed merge issues and deleted old stuff