remove a few references to local clusters not needed anymore