Some more controller cleanup