cleanup trigger removal, fix pom/aspectj issue