Removed unused context and command in place of using watch statement.