Added support for removal of automatic host masks