Fix for build system, and remove some cruft

[afarhan]

Rafael, there are numerous pulls here, some may not be relevent. Can you provide a fresh pull request?