More Beacon cleanups.