Remove unnecessary definitons
Do not put operators into global namespace
Merge pull request #1 from mpeterv/fix-redefinitions-and-global-pollution

Fix redefinitions and global pollution