more removal of unneeded code.