removed some useless