Linux build clean up