Clean up more code.