initial cleanup
merge