Merge "Clean up bug_map"