[TBD]Macbook cleanup