clean up variables
merge