Refine code
Remove data