Clean up macro interface