Add Unix clean up
Add Unix window clean up