Fix initial build  cleanup for linux