Cleanup for clean ubuntu build