removing merged stuff that shoudln't have been merged
reverting back to working file to fix merge issues