Removed code from another pull request