remove access-point dependency so that i can patch it