cleanup cont'd