Revert 4 feature/singleton