cleanup trigger removal, fix aspectj error in pom