Removed some changes