removed some stuff that should have never been here to begin with