Cleaned up beacon dictionaries