Cleanup, updates for specific use cases in Beacon.