double commander: 0.5.4 and clean up spark