Remove command block until #136 is fixed