Some cleanup for @cvan