Remove modifications for pull request # 5