Clean up some code.
merge