removed some useless stuff
small changes