Migration of more controllers to autowired constructors