Remove unused function

Just a bit of code cleanup
Merge branch 'master'