Remove mako, fix edison path