Revert "aop & data"

This reverts commit f9a46130e3ac5976ce183e14b5338e05ae46d601.