More periodic bundle controller cleanup