v1.1 cleanup