remove usage of custom payment classes.