DC21-436: Remove logic in controller - already handled in model