comment controller cleanup