Remove values from interfaces map to fix templates