cleanup branch: remove spring-flow & AOP