Remove macro pollution