remove 2 more methods

Change-Id: I24401017b7e0022d61dbb98c4d14ea17eb83fb41