removed some useless stuff