removed some useless stuf