Refactoring
Before removing old services