2.0 cleanup