PIM-2137 : move removeExtraParameter method and ensure it's called only
for ORM implementation, we'll see with a more complete ODm one if we can
abstract this properly