deleting useless stuff
more cleaning up