Revert "AMSCore"

This reverts commit d928241326b621f92227588bc094b5ea51803424.