Unneeded code removal