Cleaning up latest changes.