More system plugin controller cleanup