remove import not used
rearrange the order of operations ofcanceling order and apply new charge task
Merge branch 'master' of https://github.com/emrys-fan/startover