Revert "Ap system"

This reverts commit 54bfa3a2de19f79e766708740671c3612f858757.