Code refactoring + delete activiti spring dependency