Clean up some previous code.