cleanup
more mock-ability of hr...for testing in emulator