Remove some more mako references

Change-Id: I90977daa834cdf98f1a8ec4df3a27b97186d2306