Cleaning up old code--hopefully late enough not to mess anyone up