moar scope cleanup