Updates for build
Cleanup