Merge pull request #2462 from zachpanz88/build-fix

Fix build to remove all comments other than header