cleanup, fix double declaration in base entity class