Iface cleanup