Remove mixin hook -- it didn't work. Start on delegation