Remove redundant folders