Refactor away redundant controllers