v6 cleaned up