Removing unused tasks and left overs
Merge pull request #4 from topcoat/cleanup

Removing unused tasks and left overs