Remove more now unneeded methods.