Macros and collections removal from std
Merge pull request #28 from vhbit/master-fallout

Macros and collections removal from std