cleanup entities

cleanup entities