Remove how we were handling commands. Due for rewrite.