Removing unneeded code