Remove unneeded branch test
Simplify command handlers