started removing tasks
Removed / Updated "Todo" comments
Merge branch 'feature-taskremoval' into develop
Updated Version