Remove values from interfaces map to fixes #149