Fix multiplemac and clean. closes #1964