Removing some changes that are not needed yet