Removal of `@Controller`

This PR supersedes #1040.