Clean up / updates per review

- Return task running message after task has been launched
- Remove unnecessary code from scheduler
- Add TODO’s