Clean up some code.