Removal of some useless code.