cleanup and slightly improved metro