some controller cleanup