Cleaned some changes