removed some more unnecessary code