Removed some unnecessary changes.