more clean up - part sim