Retain only main entityService in setup