clean up driver code