Make remove option valueless
Fix docblock for removal function
Remove additional whitespace added accidentally
Fix whitespace removal
Move removals into separate model