Yep. They belong in the same group as the MAFIAA and are not needed anymore.