removal of unneeded code