remove dependency on basemodel, causing problems in production