removed unwanted code to sync with latest source/master branch