remove leftovers of deprecated merb support

Now using the right branch