removed role enitity since it is not needed anymore.. Major code clean up
moved to global database