Removed some not necessary functions
Fixed EntityBaseService