cleaned up solid driver