remove old code, add new EntityMan. test