Clean up some imports
Use mtl classes to avoid most explicit lifting