Removing some useless code