Remove lazy loading which I broke, rename mock to bind