Beats macro forms cleanup