removed more merb crap