clean up
replace with working copy