getting rid of some useless stuff