basis: cleanup more usings.