[07] controller cleanup done