removed more useless stuff