more controller cleanup