removing some stuff that isn't needed anymore