More cleanup.
More cleanup.

plasma-umass/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake