Build fixes and cleanup
Build fixes and cleanup