On cleanup, drop the roles as well