cleanup and remove unused dirs