removing some useless code