Additional cleanup by Tim