remove serverside dependency on extentity