Remove unused code and changed rethrw exception in DebitCard