Project build setup cleanup.
Merge