1.0.2 clean up