trying to get rid of top up
Get rid of TopUp references