update

fixed copy and removed clean up codes.