More controller cleanup