Clean up inverse driver some more