Introduced empty folder clearance