removing some stuff that shouldn't have been added
changes