Removing more unneeded code