removed the commented out code
Merge branch 'current-sprint' into prov-wizard