2.0.3 cleanup