Cleanup in the code.