Performance optimization - removed senseless code
Merge pull request #824 from Kienz/patch-2

Performance optimization - removed senseless code