Remove more unneeded code