Remove some controller bloat