removed some useless components