working on delete clean ups