cleanup entities / models