otterx: Remove unneeded remnants

Change-Id: I76216210fd9fe264b76ab702b84092398c5e7d86