more folder cleanup