Remove methods which can get confused due to erasure of generics