Remove unneeded code