1.0.2 cleanup