Remove broken overriden methods to fix master.