Removed unused method
Fixed shadowing variable
Merge pull request #1319 from mc-server/webadminfixes

A couple of fixes for issues with the webadmin
Merge remote-tracking branch 'upstream/master'