Remove tuples lib and clean up imports.