Removed some leftover crap after a merge