removing some stuff that shouldn't be there...