Cleanup auto-complete
Cleanup minimap