Fix cleanup of interfaces