Clean up needless binding and command