PIM-2833: Implements some spec for remove methods