Hotfix: remove AP
Finish 0.2.2