Revert "experiment with sw2/ad class"

This reverts commit 75aab086900ad9c23901b9214a59cdcd625aa9d1.
reverted to original