Remove old ui entities
Remove data entities