Removes commented out code
Merge remote-tracking branch 'origin/mvcproject'