Removing old comment
Fixing bug from a merge conflict with master