Macros and collections removal from std