removed some useless code