removed more unnecessary code