Removed some stuff that shouldn't have been kept in the merge