Big refactoring for remove no needed activities