Removed Other changes to prepare for pull request