Included Entity Remover functionality and refactored controller code