ART-686 - Tidy AP implementation, remove unused code.