cleanup some and make sure we check on the presence of credit_cards items as well.
all green