remove some more mako/chameleon references