DB model change & clean script