removed unnecessary code, but they aren't replaced by working code yet