Clean up standalone distribution
Merge pull request #1906 from jbertram/master

Clean up standalone distribution