Minor build cleanup
Almost 0.7.0
Cleanup