Middleman cleanup