Post Summer Sprints Work, 'Nice to Haves'

Remove commented code