Remove checks for support instances