Cont'd cleanup.