Cleanups after changes.