V1.0 clean up