refactoring: remove measure singleton