System plugin controller cleanup