Remove sketchy inheritance usages in credit card module