Worksapce clean up