Removed old AccessPoint indexing logic, now that it has been replaced with multiple access point support