some code modifications

deleting uneeded lines and stuff