Revert "Revert "Mako cleanup""

This reverts commit 22fbf37a773e66d779b7d997a29ad7541ee9eebe.