Removed some non-public code
Support for property templates for build options.