Remove logic from commands.