0.0.350 cleanup