Clean up to build in linux
Commit merge