Breaking changes: remove old *Where commands, re-work conditions to be more flexible, remove long command aliases