removed some missed mako remnants