Clean up global element lookup (occasionally)
Merge branch 'cleanup'