Get rid of unused commands (#39)