make it compatible with tests
removed some debug logs
Merge branch 'no-method-store'