Removing some few more useless code.