Added remove functionality based off recent changes to totorom.

Change-Id: I670e60b7754fe4b9d2feb49728a5c6833c1b71e0