Some cleanup of dumps etc.