Removed some more stuff caused by merge conflicts

Should now be running smoothly