Clean up post-build scripts
Update build order of solution