Removing some obsolete logic
Merge branch 'master' into testBranch