remove commented out code, update build
Merge branch 'enhancement/upgrade/blueprints/fix/build'