Use util.inherits, remove dev bundle changes