- removing identity related services
- updating generic services and aligning grids