Merge pull request #3957 from Jalle19/minor-cleanups
authorSam Stenvall <Jalle19@users.noreply.github.com>
Sat, 12 Jul 2014 21:38:44 +0000 (00:38 +0300)
committerSam Stenvall <Jalle19@users.noreply.github.com>
Sat, 12 Jul 2014 21:38:44 +0000 (00:38 +0300)
Remove some unused code, reuse existing methods, and remove duplicate logging


Trivial merge