v1.0 clean up