Remove redundant success Bool from Surrogate class