Remove macro debug option
Make it working with the latest macro branch