Cleanup of access point creation/deletion code