Cleaned up AOP Samples