Cleanup old auto-complete code