removing some stuff that's not needed