Removed unused tasks
Some refactoring