Remove logic that disables save button

2025-12-23 02:41:39 +00:00 · 2023-06-23 04:34:10 -07:00
70 changed files with 302 additions and 2444 deletions
--- a/images/ComplexPrompts.svg
+++ b/images/ComplexPrompts.svg
@@ -1,3 +0,0 @@
-<svg width="20" height="22" viewBox="0 0 20 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.4852 1.13266C6.25055 1.69386 5.20039 2.5918 5.20039 3.8002V7.41652C5.39862 7.40568 5.59878 7.4002 5.80039 7.4002C6.00246 7.4002 6.20261 7.40569 6.40039 7.41649V5.83795C6.72565 6.08075 7.09627 6.29095 7.4852 6.46774C8.77401 7.05356 10.5123 7.4002 12.4004 7.4002C14.2885 7.4002 16.0268 7.05356 17.3156 6.46774C17.7045 6.29095 18.0752 6.08075 18.4004 5.83795V15.8002C18.4004 16.2486 17.9731 16.8507 16.819 17.3753C15.7191 17.8752 14.1574 18.2002 12.4005 18.2002L12.4004 18.7995C12.4004 19.0077 12.379 19.208 12.3392 19.4001L12.4004 19.4002C14.2885 19.4002 16.0268 19.0535 17.3156 18.4677C18.5503 17.9066 19.6004 17.0086 19.6004 15.8002V3.8002C19.6004 2.5918 18.5503 1.69386 17.3156 1.13266C16.0268 0.546827 14.2885 0.200195 12.4004 0.200195C10.5123 0.200195 8.77401 0.546827 7.4852 1.13266ZM7.98176 5.37529C6.82769 4.85071 6.40039 4.24866 6.40039 3.8002C6.40039 3.35173 6.82769 2.74968 7.98176 2.2251C9.08168 1.72513 10.6434 1.4002 12.4004 1.4002C14.1574 1.4002 15.7191 1.72513 16.819 2.2251C17.9731 2.74968 18.4004 3.35173 18.4004 3.8002C18.4004 4.24866 17.9731 4.85071 16.819 5.37529C15.7191 5.87526 14.1574 6.2002 12.4004 6.2002C10.6434 6.2002 9.08168 5.87526 7.98176 5.37529ZM6.40039 8.61851C6.76422 8.64085 7.11714 8.68327 7.4555 8.74374C7.93669 8.82972 8.38843 8.95219 8.80015 9.10529C10.2475 9.64345 11.2004 10.56 11.2004 11.6002C11.2004 13.257 8.78273 14.6002 5.80039 14.6002C2.81805 14.6002 0.400391 13.257 0.400391 11.6002C0.400391 10.056 2.50043 8.78432 5.20039 8.61851C5.39739 8.60641 5.59759 8.6002 5.80039 8.6002C6.00319 8.6002 6.20339 8.60641 6.40039 8.61851ZM11.1112 19.3454C10.6494 20.7416 8.44723 21.7995 5.80039 21.7995C2.81805 21.7995 0.400391 20.4564 0.400391 18.7995V14.0648C0.706223 14.3399 1.04834 14.5755 1.39925 14.7705C2.58615 15.4299 4.14455 15.8002 5.80039 15.8002C7.45623 15.8002 9.01463 15.4299 10.2015 14.7705C10.553 14.5752 10.8957 14.3391 11.202 14.0633C11.2015 15.2351 11.2008 16.9706 11.2005 18.1486V18.1508C11.2004 18.3942 11.2004 18.6137 11.2004 18.7995C11.2004 18.986 11.1698 19.1684 11.1112 19.3454Z" fill="#0078D4"/>
-</svg>
--- a/images/CopilotDatabase.svg
+++ b/images/CopilotDatabase.svg
@@ -1,3 +0,0 @@
-<svg width="10" height="14" viewBox="0 0 10 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 2.5C10 3.88071 7.76142 5 5 5C2.23858 5 0 3.88071 0 2.5C0 1.11929 2.23858 0 5 0C7.76142 0 10 1.11929 10 2.5ZM0 11.5V4.487C1.057 5.413 2.864 6 5 6C7.136 6 8.943 5.413 10 4.487V11.5C10 12.925 7.851 14 5 14C2.149 14 0 12.925 0 11.5Z" fill="#0078D4"/>
-</svg>
--- a/images/CopilotFlash.svg
+++ b/images/CopilotFlash.svg
@@ -1,3 +0,0 @@
-<svg width="13" height="17" viewBox="0 0 13 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.21207 0C3.73772 0 3.32085 0.314446 3.19054 0.770537L0.940937 8.64415C0.747029 9.32283 1.25663 9.99841 1.96246 9.99841H3.22974L2.06002 14.6773C1.79611 15.7329 3.10089 16.4551 3.85526 15.6726L12.5318 6.81506L12.5354 6.81137C13.1762 6.1436 12.7152 5 11.7688 5H9.20509L10.4665 1.40582L10.469 1.39836C10.6983 0.710426 10.1863 0 9.46114 0H4.21207Z" fill="#0078D4"/>
-</svg>
--- a/images/CopilotThumb.svg
+++ b/images/CopilotThumb.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="14" viewBox="0 0 12 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.5806 0.051598C6.83006 -0.157 6.24411 0.402481 6.03494 0.923322C5.79411 1.52303 5.58243 1.94395 5.32941 2.44707C5.17287 2.75833 5.00052 3.10106 4.79565 3.53704C4.32141 4.54625 3.84755 5.19347 3.5035 5.58154C3.33128 5.77579 3.19093 5.90585 3.09835 5.98435C3.05204 6.02362 3.01761 6.05005 2.99704 6.0652L2.9809 6.07684L1.109 7.18119C0.272443 7.67473 -0.0885815 8.69797 0.253045 9.6072L0.773038 10.9912C0.989444 11.5671 1.45891 12.0114 2.04591 12.1958L7.40179 13.8781C8.73654 14.2974 10.1555 13.5397 10.5497 12.1973L11.9139 7.55127C12.29 6.2705 11.3298 4.9878 9.99492 4.9878H8.60995C8.67586 4.76117 8.74339 4.50906 8.80466 4.24751C8.93612 3.68641 9.04781 3.04484 9.03753 2.51008C9.02797 2.01293 8.97781 1.49126 8.77353 1.04807C8.55437 0.572583 8.1709 0.21566 7.5806 0.051598ZM2.9768 6.07969L2.97492 6.08097L2.9768 6.07969Z" fill="#0078D4"/>
-</svg>
--- a/images/CopliotWelcomeIllustration.svg
+++ b/images/CopliotWelcomeIllustration.svg
@@ -1,29 +0,0 @@
-<svg width="287" height="225" viewBox="0 0 287 225" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.3" d="M7.75456 192.647H231.829C233.524 192.647 235.156 191.988 236.381 190.764C237.605 189.539 238.265 187.907 238.265 186.211V33.061C238.265 29.5132 234.56 26.248 229.568 26.248L10.8314 29.576C9.98368 29.576 9.16738 29.733 8.38248 30.047C7.59758 30.3923 6.90687 30.8319 6.31034 31.4598C5.71381 32.0563 5.24287 32.747 4.89751 33.5319C4.55216 34.3168 4.42658 35.1645 4.42658 35.9808L1.31836 186.274C1.31836 187.969 1.97767 189.602 3.20212 190.795C4.42657 191.988 6.05917 192.647 7.75456 192.647Z" fill="#1F1D20"/>
-<path d="M231.264 23.3906H6.37342C2.85705 23.3906 0 26.2477 0 29.764V183.228C0 186.745 2.85705 189.602 6.37342 189.602H231.295C234.811 189.602 237.669 186.745 237.669 183.228V29.764C237.637 26.2477 234.78 23.3906 231.264 23.3906Z" fill="url(#paint0_linear_1151_179507)"/>
-<path d="M228.313 32.7148H119.62V178.707H228.313V32.7148Z" fill="white"/>
-<path d="M121.158 32.7148H12.4648V178.707H121.158V32.7148Z" fill="#CDCDD0"/>
-<path d="M34.1909 0V144.799C34.1909 144.799 63.2009 141.91 86.7166 153.715C110.264 165.52 121.158 178.581 121.158 178.581V33.7508C121.158 33.7508 107.595 16.483 86.7166 10.1095C69.7313 4.8978 34.1909 0 34.1909 0Z" fill="#EAEAEA"/>
-<path d="M141.094 102.383L134.249 99.4006L127.374 102.383V23.3906H141.094V102.383Z" fill="url(#paint1_linear_1151_179507)"/>
-<path opacity="0.15" d="M206.9 61.2871H159.304C157.231 61.2871 155.567 62.9825 155.567 65.0233C155.567 67.0954 157.263 68.7594 159.304 68.7594H206.9C208.972 68.7594 210.636 67.064 210.636 65.0233C210.668 62.9511 208.972 61.2871 206.9 61.2871Z" fill="#1F1D20"/>
-<path opacity="0.15" d="M206.9 77.5498H159.304C157.231 77.5498 155.567 79.2452 155.567 81.2859C155.567 83.3581 157.263 85.0221 159.304 85.0221H206.9C208.972 85.0221 210.636 83.3267 210.636 81.2859C210.668 79.2138 208.972 77.5498 206.9 77.5498Z" fill="#1F1D20"/>
-<path opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" d="M159.304 93.8428H206.838C208.91 93.8428 210.574 95.5381 210.574 97.5789C210.574 99.651 208.878 101.315 206.838 101.315H159.304C157.232 101.315 155.568 99.6196 155.568 97.5789C155.536 95.5381 157.2 93.8428 159.304 93.8428Z" fill="#1F1D20"/>
-<path d="M206.9 60.0303H159.304C157.231 60.0303 155.567 61.7257 155.567 63.7664C155.567 65.8385 157.263 67.5025 159.304 67.5025H206.9C208.972 67.5025 210.636 65.8072 210.636 63.7664C210.668 61.6943 208.972 60.0303 206.9 60.0303Z" fill="#50E6FF"/>
-<path d="M206.9 76.3262H159.304C157.231 76.3262 155.567 78.0216 155.567 80.0623C155.567 82.1345 157.263 83.7984 159.304 83.7984H206.9C208.972 83.7984 210.636 82.1031 210.636 80.0623C210.668 77.9902 208.972 76.3262 206.9 76.3262Z" fill="#32B0E7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M159.304 92.5889H206.838C208.91 92.5889 210.574 94.2843 210.574 96.325C210.574 98.3972 208.878 100.061 206.838 100.061H159.304C157.232 100.093 155.568 98.3658 155.568 96.325C155.536 94.2843 157.2 92.5889 159.304 92.5889Z" fill="#185A97"/>
-<path opacity="0.2" d="M287 143.834H192V205.096C192 207.687 194.089 209.776 196.68 209.776H206.648V224.265L221.243 209.776H282.32C284.911 209.776 287 207.687 287 205.096V143.834Z" fill="#1F1D21"/>
-<path d="M283.827 140H195.173C193.428 140 192 141.428 192 143.173V202.769C192 204.514 193.428 205.942 195.173 205.942H206.648V220.431L221.243 205.942H283.827C285.572 205.942 287 204.514 287 202.769V143.173C287 141.428 285.572 140 283.827 140Z" fill="#49C8EF"/>
-<path d="M254.24 161.762H224.706C223.543 161.762 222.591 162.714 222.591 163.877C222.591 165.04 223.543 165.992 224.706 165.992H254.24C255.403 165.992 256.355 165.04 256.355 163.877C256.355 162.714 255.403 161.762 254.24 161.762Z" fill="#C3F1FF"/>
-<path d="M254.24 171.042H224.706C223.543 171.042 222.591 171.994 222.591 173.157C222.591 174.321 223.543 175.272 224.706 175.272H254.24C255.403 175.272 256.355 174.321 256.355 173.157C256.355 172.02 255.403 171.042 254.24 171.042Z" fill="#C3F1FF"/>
-<path d="M254.24 180.373H224.706C223.543 180.373 222.591 181.325 222.591 182.488C222.591 183.652 223.543 184.604 224.706 184.604H254.24C255.403 184.604 256.355 183.652 256.355 182.488C256.355 181.298 255.403 180.373 254.24 180.373Z" fill="#C3F1FF"/>
-<defs>
-<linearGradient id="paint0_linear_1151_179507" x1="118.845" y1="34.0854" x2="118.845" y2="202.888" gradientUnits="userSpaceOnUse">
-<stop stop-color="#007ED8"/>
-<stop offset="0.7065" stop-color="#002D4C"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1151_179507" x1="87.2694" y1="-23.1274" x2="250.063" y2="275.059" gradientUnits="userSpaceOnUse">
-<stop stop-color="#007ED8"/>
-<stop offset="0.7065" stop-color="#002D4C"/>
-</linearGradient>
-</defs>
-</svg>
--- a/images/Hint.svg
+++ b/images/Hint.svg
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.39804 9.80882C4.57428 9.93313 4.78476 9.99968 5.00043 9.9993C5.21633 9.99946 5.42686 9.93197 5.60243 9.8063C5.77993 9.67582 5.91464 9.49552 5.98943 9.2883L6.43643 7.9153C6.55086 7.57101 6.74391 7.25811 7.00028 7.00139C7.25665 6.74467 7.56929 6.5512 7.91343 6.4363L9.30443 5.9853C9.45636 5.93095 9.59364 5.84214 9.70551 5.72586C9.81738 5.60957 9.9008 5.46896 9.94924 5.31503C9.99767 5.16111 10.0098 4.99806 9.98468 4.83867C9.95955 4.67927 9.89786 4.52786 9.80443 4.3963C9.67034 4.21038 9.47939 4.07314 9.26043 4.0053L7.88543 3.5583C7.54091 3.44407 7.22777 3.25111 6.97087 2.99472C6.71396 2.73833 6.52035 2.42558 6.40543 2.0813L5.95343 0.693301C5.88113 0.490997 5.74761 0.316236 5.57143 0.193301C5.43877 0.0995741 5.28607 0.0380931 5.12548 0.0137472C4.96489 -0.0105984 4.80083 0.00286224 4.64636 0.0530596C4.49188 0.103257 4.35125 0.188806 4.23564 0.302903C4.12004 0.417 4.03265 0.556497 3.98043 0.710301L3.52343 2.1103C3.40884 2.44513 3.21967 2.74954 2.97022 3.00055C2.72076 3.25157 2.41753 3.44263 2.08343 3.5593L0.692428 4.0073C0.540653 4.0617 0.403522 4.15048 0.291767 4.26669C0.180011 4.3829 0.0966621 4.5234 0.0482407 4.67719C-0.000180673 4.83097 -0.0123605 4.99388 0.0126534 5.15315C0.0376676 5.31243 0.0991972 5.46376 0.192428 5.5953C0.320272 5.77475 0.501046 5.90972 0.709428 5.9813L2.08343 6.4263C2.52354 6.57278 2.90999 6.84713 3.19343 7.2143C3.35585 7.42494 3.4813 7.66164 3.56443 7.9143L4.01643 9.3053C4.08846 9.50859 4.22179 9.68452 4.39804 9.80882ZM4.48343 2.3943L5.01043 1.0173L5.44943 2.3943C5.61312 2.88745 5.88991 3.33546 6.25767 3.70253C6.62544 4.0696 7.07397 4.34554 7.56743 4.5083L8.97343 5.0373L7.59143 5.4853C7.09866 5.6496 6.65095 5.92646 6.28382 6.29393C5.9167 6.66141 5.64026 7.10938 5.47643 7.6023L4.95343 8.9803L4.50443 7.6013C4.34335 7.10803 4.06943 6.65913 3.70443 6.2903C3.3356 5.92226 2.88653 5.64467 2.39243 5.4793L1.01443 4.9573L2.40043 4.5073C2.88672 4.33867 3.32775 4.06051 3.68943 3.6943C4.04901 3.3266 4.32049 2.88211 4.48343 2.3943ZM10.5353 13.8513C10.6713 13.9475 10.8337 13.9992 11.0003 13.9993C11.1654 13.9994 11.3264 13.9484 11.4613 13.8533C11.6008 13.7548 11.7058 13.6149 11.7613 13.4533L12.0093 12.6913C12.0625 12.5329 12.1515 12.3888 12.2693 12.2703C12.3867 12.1518 12.5307 12.063 12.6893 12.0113L13.4613 11.7593C13.619 11.7048 13.7557 11.6024 13.8523 11.4663C13.9257 11.3633 13.9736 11.2444 13.9921 11.1193C14.0106 10.9942 13.9992 10.8665 13.9588 10.7467C13.9184 10.6268 13.8501 10.5183 13.7597 10.4299C13.6692 10.3415 13.5591 10.2759 13.4383 10.2383L12.6743 9.98933C12.5162 9.93676 12.3724 9.84814 12.2544 9.73048C12.1364 9.61281 12.0473 9.46932 11.9943 9.31133L11.7423 8.53833C11.6886 8.38048 11.586 8.24387 11.4493 8.14833C11.3473 8.07538 11.2295 8.02744 11.1056 8.00838C10.9816 7.98932 10.8549 7.99967 10.7357 8.0386C10.6164 8.07753 10.508 8.14395 10.4192 8.23249C10.3304 8.32104 10.2636 8.42923 10.2243 8.54833L9.97731 9.31033C9.92502 9.46798 9.83747 9.61162 9.72131 9.73033C9.60657 9.8468 9.46665 9.93541 9.31231 9.98933L8.53931 10.2413C8.38025 10.2952 8.2422 10.3978 8.1447 10.5346C8.04721 10.6713 7.99522 10.8353 7.99611 11.0032C7.99699 11.1712 8.0507 11.3346 8.14963 11.4703C8.24856 11.606 8.38769 11.7071 8.54731 11.7593L9.31031 12.0063C9.46917 12.0597 9.61358 12.149 9.73231 12.2673C9.85053 12.3856 9.93896 12.5302 9.99031 12.6893L10.2433 13.4633C10.2981 13.6198 10.4001 13.7554 10.5353 13.8513ZM9.62231 11.0583L9.44331 10.9993L9.62731 10.9353C9.92907 10.8304 10.2027 10.6576 10.4273 10.4303C10.6537 10.2013 10.8248 9.92359 10.9273 9.61833L10.9853 9.44033L11.0443 9.62133C11.1463 9.92803 11.3185 10.2067 11.5471 10.4352C11.7757 10.6636 12.0545 10.8356 12.3613 10.9373L12.5563 11.0003L12.3763 11.0593C12.0689 11.1615 11.7898 11.3342 11.5611 11.5636C11.3324 11.793 11.1606 12.0727 11.0593 12.3803L11.0003 12.5613L10.9423 12.3803C10.8409 12.0722 10.6687 11.792 10.4394 11.5625C10.2102 11.3329 9.93033 11.1602 9.62231 11.0583Z" fill="#424242"/>
-</svg>
--- a/images/IntermediatePrompts.svg
+++ b/images/IntermediatePrompts.svg
@@ -1,3 +0,0 @@
-<svg width="20" height="22" viewBox="0 0 20 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.799805 3.99971C0.799805 2.79131 1.8498 1.89371 3.0798 1.33211C4.6378 0.684806 6.313 0.367334 7.9998 0.39971C9.68664 0.367334 11.3618 0.684806 12.9198 1.33211C14.1498 1.89371 15.1998 2.79131 15.1998 3.99971V10.1304C14.827 10.1594 14.4604 10.2471 14.1138 10.3906C14.0755 10.4066 14.0375 10.423 13.9998 10.4403V6.03971C13.6631 6.28732 13.301 6.49849 12.9198 6.66971C11.3616 7.3162 9.6864 7.63285 7.9998 7.59971C6.313 7.63209 4.6378 7.31461 3.0798 6.66731C2.69864 6.49686 2.33662 6.28648 1.9998 6.03971V15.9997C1.9998 16.4485 2.427 17.0497 3.5814 17.5753C4.98209 18.1502 6.48605 18.4308 7.9998 18.3997L8.02536 18.4002C8.03904 18.4647 8.05452 18.529 8.0718 18.593L7.15982 19.5098C7.13596 19.5337 7.11282 19.5582 7.09042 19.5832C5.71356 19.507 4.35728 19.198 3.0798 18.6673C1.8498 18.1057 0.799805 17.2081 0.799805 15.9997V3.99971ZM1.9998 3.99971C1.9998 4.44851 2.427 5.04971 3.5814 5.57531C4.98209 6.15018 6.48605 6.4308 7.9998 6.39971C9.5136 6.4308 11.0176 6.15018 12.4182 5.57531C13.5726 5.04971 13.9998 4.44851 13.9998 3.99971C13.9998 3.55091 13.5726 2.94971 12.4182 2.42411C11.0176 1.84924 9.5136 1.56863 7.9998 1.59971C6.48605 1.56863 4.98209 1.84924 3.5814 2.42411C2.427 2.94971 1.9998 3.55091 1.9998 3.99971ZM19.0373 11.0246C19.15 10.9122 19.2133 10.7595 19.2134 10.6003C19.2136 10.441 19.1504 10.2883 19.0379 10.1756C18.9254 10.0629 18.7728 9.99963 18.6136 9.99952C18.4543 9.9994 18.3016 10.0626 18.1889 10.175L16.7657 11.5982C16.7506 11.6187 16.7366 11.64 16.7237 11.6618C16.2658 11.3886 15.7297 11.2755 15.2004 11.3407C14.6711 11.4058 14.1785 11.6456 13.8005 12.0218L13.0805 12.7418C12.8603 12.9626 12.7366 13.2616 12.7366 13.5734C12.7366 13.8853 12.8603 14.1843 13.0805 14.405L14.8109 16.1318C15.0317 16.3525 15.331 16.4764 15.6431 16.4764C15.9552 16.4764 16.2546 16.3525 16.4753 16.1318L17.1953 15.4118C17.5718 15.0338 17.8117 14.541 17.8769 14.0114C17.942 13.4817 17.829 12.9456 17.5553 12.4874C17.5777 12.4753 17.599 12.4612 17.6189 12.4454L19.0373 11.0246ZM12.2317 15.2498C12.1225 15.1405 11.9928 15.054 11.8501 14.9948C11.7074 14.9356 11.5546 14.9053 11.4001 14.9053C11.2457 14.9053 11.0927 14.9356 10.95 14.9948C10.8073 15.054 10.6777 15.1405 10.5685 15.2498L9.84852 15.9698C9.47196 16.3478 9.23208 16.8406 9.16692 17.3702C9.10176 17.8998 9.21492 18.436 9.48852 18.8942C9.46632 18.9066 9.44508 18.9206 9.42492 18.9362L8.00652 20.3582C7.89722 20.4714 7.83674 20.6229 7.8381 20.7802C7.83947 20.9376 7.90258 21.088 8.01384 21.1993C8.12508 21.3105 8.27556 21.3736 8.43288 21.375C8.5902 21.3763 8.74176 21.3158 8.85492 21.2066L10.2769 19.7834C10.2926 19.7631 10.3072 19.7419 10.3201 19.7198C10.778 19.993 11.3141 20.1061 11.8434 20.0409C12.3727 19.9756 12.8653 19.736 13.2433 19.3598L13.9633 18.6398C14.184 18.419 14.3078 18.1197 14.3078 17.8076C14.3078 17.4955 14.184 17.1961 13.9633 16.9754L12.2317 15.2498Z" fill="#0078D4"/>
-</svg>
--- a/images/QueryCopilotNewLogo.svg
+++ b/images/QueryCopilotNewLogo.svg
@@ -1,34 +0,0 @@
-<svg width="32" height="34" viewBox="0 0 32 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 0.739258L16 1.04436V9.68622L11.2 10.8013L9.60002 12.9967V16.4479C9.60002 18.7669 10.8545 20.9045 12.879 22.0353L17.4036 24.5626L9.6 28.69L6.35592 29.1523L3.27902 27.4337C1.25445 26.3028 0 24.1652 0 21.8462V11.7591C0 9.43952 1.25512 7.30147 3.28055 6.17085L12.3174 1.12639L12.3121 1.13012L13 0.739258Z" fill="url(#paint0_radial_857_143948)"/>
-<path d="M13 0.739258L16 1.04436V9.68622L11.2 10.8013L9.60002 12.9967V16.4479C9.60002 18.7669 10.8545 20.9045 12.879 22.0353L17.4036 24.5626L9.6 28.69L6.35592 29.1523L3.27902 27.4337C1.25445 26.3028 0 24.1652 0 21.8462V11.7591C0 9.43952 1.25512 7.30147 3.28055 6.17085L12.3174 1.12639L12.3121 1.13012L13 0.739258Z" fill="url(#paint1_linear_857_143948)"/>
-<path d="M22.399 12.001L30.399 16.801L31.999 18.401V21.8452C31.999 24.1642 30.7446 26.3018 28.72 27.4327L19.12 32.7949C17.1804 33.8784 14.8177 33.8784 12.878 32.7949L3.27804 27.4327C3.09146 27.3284 2.91141 27.2157 2.73828 27.095L3.278 27.3965C5.21762 28.4799 7.58035 28.4799 9.51996 27.3965L19.12 22.0342C21.1445 20.9033 22.399 18.7657 22.399 16.4467V12.001Z" fill="url(#paint2_radial_857_143948)"/>
-<path d="M22.399 12.001L30.399 16.801L31.999 18.401V21.8452C31.999 24.1642 30.7446 26.3018 28.72 27.4327L19.12 32.7949C17.1804 33.8784 14.8177 33.8784 12.878 32.7949L3.27804 27.4327C3.09146 27.3284 2.91141 27.2157 2.73828 27.095L3.278 27.3965C5.21762 28.4799 7.58035 28.4799 9.51996 27.3965L19.12 22.0342C21.1445 20.9033 22.399 18.7657 22.399 16.4467V12.001Z" fill="url(#paint3_linear_857_143948)"/>
-<path d="M28.7191 6.17053L19.119 0.811705C17.1802 -0.270568 14.819 -0.270568 12.8802 0.811704L12.3151 1.1271C10.6239 2.31737 9.59961 4.26472 9.59961 6.36025V13.0461L12.8802 11.2149C14.819 10.1326 17.1802 10.1326 19.119 11.2149L28.7191 16.5737C30.6984 17.6786 31.9421 19.7456 31.9977 22.0039C31.999 21.9514 31.9996 21.8987 31.9996 21.8459V11.7588C31.9996 9.4392 30.7445 7.30115 28.7191 6.17053Z" fill="url(#paint4_radial_857_143948)"/>
-<path d="M28.7191 6.17053L19.119 0.811705C17.1802 -0.270568 14.819 -0.270568 12.8802 0.811704L12.3151 1.1271C10.6239 2.31737 9.59961 4.26472 9.59961 6.36025V13.0461L12.8802 11.2149C14.819 10.1326 17.1802 10.1326 19.119 11.2149L28.7191 16.5737C30.6984 17.6786 31.9421 19.7456 31.9977 22.0039C31.999 21.9514 31.9996 21.8987 31.9996 21.8459V11.7588C31.9996 9.4392 30.7445 7.30115 28.7191 6.17053Z" fill="url(#paint5_linear_857_143948)"/>
-<defs>
-<radialGradient id="paint0_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(13.5054 9.8837) rotate(112.544) scale(23.4519 19.3067)">
-<stop offset="0.206732" stop-color="#4995D0"/>
-<stop offset="0.875628" stop-color="#0078D4"/>
-</radialGradient>
-<linearGradient id="paint1_linear_857_143948" x1="11.0625" y1="26.6174" x2="9.78695" y2="24.2436" gradientUnits="userSpaceOnUse">
-<stop offset="0.9999" stop-color="#0078D4"/>
-<stop offset="1" stop-color="#0078D4" stop-opacity="0"/>
-</linearGradient>
-<radialGradient id="paint2_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(6.899 24.5214) rotate(-3.9995) scale(24.6197 15.4594)">
-<stop offset="0.140029" stop-color="#80C8FF"/>
-<stop offset="0.952721" stop-color="#0078D4"/>
-</radialGradient>
-<linearGradient id="paint3_linear_857_143948" x1="26.8932" y1="15.5508" x2="25.5491" y2="17.8921" gradientUnits="userSpaceOnUse">
-<stop offset="0.9999" stop-color="#3F8AC3"/>
-<stop offset="1" stop-color="#8C66BA" stop-opacity="0"/>
-</linearGradient>
-<radialGradient id="paint4_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(26.632 16.3878) rotate(-138.33) scale(22.8015 13.0047)">
-<stop stop-color="#7BC6FF"/>
-<stop offset="0.839255" stop-color="#0078D4"/>
-</radialGradient>
-<linearGradient id="paint5_linear_857_143948" x1="9.59961" y1="8.71337" x2="12.2131" y2="8.71337" gradientUnits="userSpaceOnUse">
-<stop offset="0.9999" stop-color="#0078D4"/>
-<stop offset="1" stop-color="#436DCD" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
--- a/images/Recent.svg
+++ b/images/Recent.svg
@@ -1,3 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.9342 7.04998C15.4095 3.21975 11.8792 0.540074 8.04894 1.06475C6.10618 1.33087 4.46008 2.36951 3.37682 3.82964L3.25046 3.99997H6.49985C6.77599 3.99997 6.99985 4.22383 6.99985 4.49997C6.99985 4.77611 6.77599 4.99997 6.49985 4.99997H2.49985C2.22371 4.99997 1.99985 4.77611 1.99985 4.49997V0.499969C1.99985 0.223826 2.22371 -3.14998e-05 2.49985 -3.14998e-05C2.77599 -3.14998e-05 2.99985 0.223826 2.99985 0.499968V2.70729C4.22416 1.31847 5.93463 0.345036 7.91322 0.0740017C12.2906 -0.525627 16.3253 2.53686 16.9249 6.91426C17.5246 11.2917 14.4621 15.3263 10.0847 15.926C5.70727 16.5256 1.67259 13.4631 1.07296 9.08571C0.998819 8.54443 0.980672 8.00788 1.01426 7.48208C1.03186 7.2065 1.26953 6.99737 1.54511 7.01497C1.82069 7.03258 2.02982 7.27025 2.01222 7.54583C1.98287 8.00544 1.99867 8.47516 2.06371 8.94999C2.58839 12.7802 6.11873 15.4599 9.94896 14.9352C13.7792 14.4105 16.4589 10.8802 15.9342 7.04998Z" fill="#424242"/>
-</svg>
--- a/images/SamplePromptsIcon.svg
+++ b/images/SamplePromptsIcon.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="20" viewBox="0 0 12 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 5.5V4.75H0.75V5.5H0ZM0 3.25V2.5H0.75V3.25H0ZM2.25 3.25V2.5H12V3.25H2.25ZM0 1V0.25H0.75V1H0ZM2.25 0.25H12V1H2.25V0.25ZM2.25 5.5V4.75H12V5.5H2.25ZM0 7.75V7H0.75V7.75H0ZM2.25 7.75V7H12V7.75H2.25Z" fill="#0078D4"/>
-</svg>
--- a/images/SimplePrompts.svg
+++ b/images/SimplePrompts.svg
@@ -1,3 +0,0 @@
-<svg width="19" height="21" viewBox="0 0 19 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 4C0 3.30945 0.3153 2.70664 0.77423 2.22025C1.2294 1.73784 1.85301 1.33745 2.56668 1.01752C3.99575 0.3769 5.91738 0 8 0C10.0826 0 12.0042 0.3769 13.4333 1.01752C14.147 1.33745 14.7706 1.73784 15.2258 2.22025C15.6847 2.70664 16 3.30945 16 4V10.2572C15.5537 9.8886 15.0482 9.589 14.5 9.3749V6.39242C14.1791 6.61282 13.8194 6.80942 13.4333 6.98248C12.0042 7.6231 10.0826 8 8 8C5.91738 8 3.99575 7.6231 2.56668 6.98248C2.18063 6.80942 1.82094 6.61282 1.5 6.39242V16C1.5 16.2069 1.59044 16.4591 1.86525 16.7503C2.14382 17.0456 2.58195 17.3455 3.18027 17.6137C4.37519 18.1494 6.0786 18.5 8 18.5C8.2396 18.5 8.4759 18.4945 8.7081 18.484C9.3109 19.0579 10.0438 19.4964 10.858 19.7507C9.9673 19.9127 9.0023 20 8 20C5.91738 20 3.99575 19.6231 2.56668 18.9825C1.85301 18.6626 1.2294 18.2622 0.77423 17.7798C0.3153 17.2934 0 16.6906 0 16V4ZM1.5 4C1.5 4.20691 1.59044 4.45909 1.86525 4.75034C2.14382 5.04559 2.58195 5.3455 3.18027 5.61372C4.37519 6.14937 6.0786 6.5 8 6.5C9.9214 6.5 11.6248 6.14937 12.8197 5.61372C13.418 5.3455 13.8562 5.04559 14.1348 4.75034C14.4096 4.45909 14.5 4.20691 14.5 4C14.5 3.79309 14.4096 3.54091 14.1348 3.24966C13.8562 2.95441 13.418 2.65449 12.8197 2.38628C11.6248 1.85063 9.9214 1.5 8 1.5C6.0786 1.5 4.37519 1.85063 3.18027 2.38628C2.58195 2.65449 2.14382 2.95441 1.86525 3.24966C1.59044 3.54091 1.5 3.79309 1.5 4ZM12.5 19C13.4719 19 14.3718 18.6919 15.1074 18.1681L17.7197 20.7803C18.0126 21.0732 18.4874 21.0732 18.7803 20.7803C19.0732 20.4874 19.0732 20.0126 18.7803 19.7197L16.1681 17.1074C16.6919 16.3718 17 15.4719 17 14.5C17 12.0147 14.9853 10 12.5 10C10.0147 10 8 12.0147 8 14.5C8 16.9853 10.0147 19 12.5 19ZM12.5 17.5C10.8431 17.5 9.5 16.1569 9.5 14.5C9.5 12.8431 10.8431 11.5 12.5 11.5C14.1569 11.5 15.5 12.8431 15.5 14.5C15.5 16.1569 14.1569 17.5 12.5 17.5Z" fill="#0078D4"/>
-</svg>
--- a/images/X-errorMessage.svg
+++ b/images/X-errorMessage.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 0C8.73438 0 9.44271 0.0963542 10.125 0.289062C10.8073 0.476562 11.4427 0.744792 12.0312 1.09375C12.625 1.44271 13.1641 1.86198 13.6484 2.35156C14.138 2.83594 14.5573 3.375 14.9062 3.96875C15.2552 4.55729 15.5234 5.19271 15.7109 5.875C15.9036 6.55729 16 7.26562 16 8C16 8.73438 15.9036 9.44271 15.7109 10.125C15.5234 10.8073 15.2552 11.4453 14.9062 12.0391C14.5573 12.6276 14.138 13.1667 13.6484 13.6562C13.1641 14.1406 12.625 14.5573 12.0312 14.9062C11.4427 15.2552 10.8073 15.526 10.125 15.7188C9.44271 15.9062 8.73438 16 8 16C7.26562 16 6.55729 15.9062 5.875 15.7188C5.19271 15.526 4.55469 15.2552 3.96094 14.9062C3.3724 14.5573 2.83333 14.1406 2.34375 13.6562C1.85938 13.1667 1.44271 12.6276 1.09375 12.0391C0.744792 11.4453 0.473958 10.8073 0.28125 10.125C0.09375 9.44271 0 8.73438 0 8C0 7.26562 0.09375 6.55729 0.28125 5.875C0.473958 5.19271 0.744792 4.55729 1.09375 3.96875C1.44271 3.375 1.85938 2.83594 2.34375 2.35156C2.83333 1.86198 3.3724 1.44271 3.96094 1.09375C4.55469 0.744792 5.19271 0.476562 5.875 0.289062C6.55729 0.0963542 7.26562 0 8 0ZM8 15C8.64583 15 9.26562 14.9167 9.85938 14.75C10.4583 14.5833 11.0156 14.349 11.5312 14.0469C12.0521 13.7396 12.5234 13.375 12.9453 12.9531C13.3724 12.526 13.737 12.0547 14.0391 11.5391C14.3464 11.0182 14.5833 10.4609 14.75 9.86719C14.9167 9.26823 15 8.64583 15 8C15 7.35417 14.9167 6.73438 14.75 6.14062C14.5833 5.54167 14.3464 4.98438 14.0391 4.46875C13.737 3.94792 13.3724 3.47656 12.9453 3.05469C12.5234 2.6276 12.0521 2.26302 11.5312 1.96094C11.0156 1.65365 10.4583 1.41667 9.85938 1.25C9.26562 1.08333 8.64583 1 8 1C7.35417 1 6.73177 1.08333 6.13281 1.25C5.53906 1.41667 4.98177 1.65365 4.46094 1.96094C3.94531 2.26302 3.47396 2.6276 3.04688 3.05469C2.625 3.47656 2.26042 3.94792 1.95312 4.46875C1.65104 4.98438 1.41667 5.54167 1.25 6.14062C1.08333 6.73438 1 7.35417 1 8C1 8.64583 1.08333 9.26823 1.25 9.86719C1.41667 10.4609 1.65104 11.0182 1.95312 11.5391C2.26042 12.0547 2.625 12.526 3.04688 12.9531C3.47396 13.375 3.94531 13.7396 4.46094 14.0469C4.98177 14.349 5.53906 14.5833 6.13281 14.75C6.73177 14.9167 7.35417 15 8 15ZM11.4609 5.24219L8.71094 8L11.4609 10.7578L10.7578 11.4609L8 8.71094L5.24219 11.4609L4.53906 10.7578L7.28906 8L4.53906 5.24219L5.24219 4.53906L8 7.28906L10.7578 4.53906L11.4609 5.24219Z" fill="#E00B1C"/>
-</svg>
--- a/images/successfulPopup.svg
+++ b/images/successfulPopup.svg
@@ -1,4 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 14C10.866 14 14 10.866 14 7C14 3.13401 10.866 0 7 0C3.13401 0 0 3.13401 0 7C0 10.866 3.13401 14 7 14Z" fill="#57A300"/>
-<path d="M3.10891 7.25414C3.04416 7.18502 3.01091 7.09402 3.01441 6.99952C3.01791 6.90414 3.05816 6.81664 3.12816 6.75102L3.85879 6.07552C3.92529 6.01514 4.01016 5.98189 4.09854 5.98189C4.19654 5.98189 4.29104 6.02302 4.35754 6.09477L6.22654 8.10027L9.55766 3.83464C9.62504 3.74802 9.72653 3.69727 9.83678 3.69727C9.91553 3.69727 9.98991 3.72264 10.0529 3.77077L10.8457 4.38239C10.997 4.49439 11.0294 4.71227 10.9157 4.86714L6.65616 10.321C6.49079 10.5328 6.17491 10.5468 5.99116 10.3499L3.10891 7.25414Z" fill="white"/>
-</svg>
--- a/less/TableStyles/fulldatatables.less
+++ b/less/TableStyles/fulldatatables.less
@@ -650,4 +650,4 @@ tr:hover td.nameColumnText {

 .context-menu-item.icon-customize-columns {
    background-image: url(../../images/Options.svg);
-}
+}
--- a/src/Common/SampleDataClient.ts
+++ b/src/Common/SampleDataClient.ts
@@ -1,26 +0,0 @@
-import * as Cosmos from "@azure/cosmos";
-import { userContext } from "UserContext";
-
-let _sampleDataclient: Cosmos.CosmosClient;
-
-export function sampleDataClient(): Cosmos.CosmosClient {
-  if (_sampleDataclient) {
-    return _sampleDataclient;
-  }
-
-  const sampleDataConnectionInfo = userContext.sampleDataConnectionInfo;
-  const options: Cosmos.CosmosClientOptions = {
-    endpoint: sampleDataConnectionInfo.accountEndpoint,
-    tokenProvider: async () => {
-      const sampleDataConnectionInfo = userContext.sampleDataConnectionInfo;
-      return Promise.resolve(sampleDataConnectionInfo.resourceToken);
-    },
-    connectionPolicy: {
-      enableEndpointDiscovery: false,
-    },
-    userAgentSuffix: "Azure Portal",
-  };
-
-  _sampleDataclient = new Cosmos.CosmosClient(options);
-  return _sampleDataclient;
-}
--- a/src/Common/dataAccess/readCollection.ts
+++ b/src/Common/dataAccess/readCollection.ts
@@ -1,39 +1,13 @@
-import { CosmosClient } from "@azure/cosmos";
-import { sampleDataClient } from "Common/SampleDataClient";
-import { userContext } from "UserContext";
 import * as DataModels from "../../Contracts/DataModels";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";

 export async function readCollection(databaseId: string, collectionId: string): Promise<DataModels.Collection> {
-  const cosmosClient = client();
-  return await readCollectionInternal(cosmosClient, databaseId, collectionId);
-}
-
-export async function readSampleCollection(): Promise<DataModels.Collection> {
-  const cosmosClient = sampleDataClient();
-
-  const sampleDataConnectionInfo = userContext.sampleDataConnectionInfo;
-  const databaseId = sampleDataConnectionInfo?.databaseId;
-  const collectionId = sampleDataConnectionInfo?.collectionId;
-
-  if (!databaseId || !collectionId) {
-    return undefined;
-  }
-
-  return await readCollectionInternal(cosmosClient, databaseId, collectionId);
-}
-
-export async function readCollectionInternal(
-  cosmosClient: CosmosClient,
-  databaseId: string,
-  collectionId: string
-): Promise<DataModels.Collection> {
  let collection: DataModels.Collection;
  const clearMessage = logConsoleProgress(`Querying container ${collectionId}`);
  try {
-    const response = await cosmosClient.database(databaseId).container(collectionId).read();
+    const response = await client().database(databaseId).container(collectionId).read();
    collection = response.resource as DataModels.Collection;
  } catch (error) {
    handleError(error, "ReadCollection", `Error while querying container ${collectionId}`);
--- a/src/Contracts/ExplorerContracts.ts
+++ b/src/Contracts/ExplorerContracts.ts
@@ -38,7 +38,6 @@ export enum MessageTypes {
  OpenPostgreSQLPasswordReset,
  OpenPostgresNetworkingBlade,
  OpenCosmosDBNetworkingBlade,
-  DisplayNPSSurvey,
 }

 export { Versions, ActionContracts, Diagnostics };
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -1,4 +1,3 @@
-import { ReactTabKind, useTabs } from "hooks/useTabs";
 import React from "react";
 import AddCollectionIcon from "../../images/AddCollection.svg";
 import AddSqlQueryIcon from "../../images/AddSqlQuery_16x16.svg";
@@ -141,19 +140,6 @@ export const createCollectionContextMenuButton = (
  return items;
 };

-export const createSampleCollectionContextMenuButton = (): TreeNodeMenuItem[] => {
-  const items: TreeNodeMenuItem[] = [];
-  if (userContext.apiType === "SQL") {
-    items.push({
-      iconSrc: AddSqlQueryIcon,
-      onClick: () => useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot),
-      label: "New SQL Query",
-    });
-  }
-
-  return items;
-};
-
 export const createStoreProcedureContextMenuItems = (
  container: Explorer,
  storedProcedure: StoredProcedure
--- a/src/Explorer/Controls/Accordion/AccordionComponent.tsx
+++ b/src/Explorer/Controls/Accordion/AccordionComponent.tsx
@@ -25,7 +25,6 @@ export class AccordionComponent extends React.Component<AccordionComponentProps>
 export interface AccordionItemComponentProps {
  title: string;
  isExpanded?: boolean;
-  styles?: React.CSSProperties;
 }

 interface AccordionItemComponentState {
@@ -54,7 +53,6 @@ export class AccordionItemComponent extends React.Component<AccordionItemCompone
  }

  public render(): JSX.Element {
-    const { styles } = this.props;
    return (
      <div className="accordionItemContainer">
        <div className="accordionItemHeader" onClick={this.onHeaderClick} onKeyPress={this.onHeaderKeyPress}>
@@ -62,11 +60,7 @@ export class AccordionItemComponent extends React.Component<AccordionItemCompone
          {this.props.title}
        </div>
        <div className="accordionItemContent">
-          <AnimateHeight
-            style={{ ...styles }}
-            duration={AccordionItemComponent.durationMS}
-            height={this.state.isExpanded ? "auto" : 0}
-          >
+          <AnimateHeight duration={AccordionItemComponent.durationMS} height={this.state.isExpanded ? "auto" : 0}>
            {this.props.children}
          </AnimateHeight>
        </div>
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -132,12 +132,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
      } else if (this.props.isAutoPilotSelected) {
        if (isDirty(this.props.maxAutoPilotThroughput, this.props.maxAutoPilotThroughputBaseline)) {
          isDiscardable = true;
-          if (
-            this.props.softAllowedMaximumThroughput
-              ? this.props.maxAutoPilotThroughput <= this.props.softAllowedMaximumThroughput &&
-                AutoPilotUtils.isValidAutoPilotThroughput(this.props.maxAutoPilotThroughput)
-              : AutoPilotUtils.isValidAutoPilotThroughput(this.props.maxAutoPilotThroughput)
-          ) {
+          if (AutoPilotUtils.isValidAutoPilotThroughput(this.props.maxAutoPilotThroughput)) {
            isSaveable = true;
          }
        }
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -1,39 +1,39 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import { IGalleryItem } from "Juno/JunoClient";
-import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
 import * as ko from "knockout";
 import React from "react";
 import _ from "underscore";
+import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
 import shallow from "zustand/shallow";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
 import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook, PoolIdType } from "../Common/Constants";
+import { readCollection } from "../Common/dataAccess/readCollection";
+import { readDatabases } from "../Common/dataAccess/readDatabases";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import { QueriesClient } from "../Common/QueriesClient";
-import { readCollection, readSampleCollection } from "../Common/dataAccess/readCollection";
-import { readDatabases } from "../Common/dataAccess/readDatabases";
 import * as DataModels from "../Contracts/DataModels";
 import { ContainerConnectionInfo, IPhoenixServiceInfo, IProvisionData, IResponse } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
+import { useSidePanel } from "../hooks/useSidePanel";
+import { useTabs } from "../hooks/useTabs";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
+import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
+import { listByDatabaseAccount } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
 import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
-import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { listByDatabaseAccount } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
-import { useSidePanel } from "../hooks/useSidePanel";
-import { useTabs } from "../hooks/useTabs";
 import "./ComponentRegisterer";
 import { DialogProps, useDialog } from "./Controls/Dialog";
 import { GalleryTab as GalleryTabKind } from "./Controls/NotebookGallery/GalleryViewerComponent";
@@ -1272,26 +1272,5 @@ export default class Explorer {
    if (useNotebook.getState().isPhoenixNotebooks) {
      await this.initNotebooks(userContext.databaseAccount);
    }
-
-    await this.refreshSampleData();
-  }
-
-  public async refreshSampleData(): Promise<void> {
-    if (!userContext.sampleDataConnectionInfo) {
-      return;
-    }
-
-    const collection: DataModels.Collection = await readSampleCollection();
-    if (!collection) {
-      return;
-    }
-
-    const databaseId = userContext.sampleDataConnectionInfo?.databaseId;
-    if (!databaseId) {
-      return;
-    }
-
-    const sampleDataResourceTokenCollection = new ResourceTokenCollection(this, databaseId, collection);
-    useDatabases.setState({ sampleDataResourceTokenCollection });
  }
 }
--- a/src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx
+++ b/src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx
@@ -205,7 +205,6 @@ export const NewVertexComponent: FunctionComponent<INewVertexComponentProps> = (
                role="button"
                onClick={onAddNewProperty}
                onKeyPress={(event: React.KeyboardEvent<HTMLSpanElement>) => onAddNewPropertyKeyPress(event)}
-                aria-label="Add property"
              >
                <img className="refreshcol rightPaneAddPropertyImg" src={AddIcon} alt="Add property" /> Add Property
              </span>
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -1,4 +1,3 @@
-import { ReactTabKind, useTabs } from "hooks/useTabs";
 import * as React from "react";
 import AddCollectionIcon from "../../../../images/AddCollection.svg";
 import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
@@ -9,23 +8,23 @@ import AddUdfIcon from "../../../../images/AddUdf.svg";
 import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
 import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
 import FeedbackIcon from "../../../../images/Feedback-Command.svg";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
 import GitHubIcon from "../../../../images/github.svg";
+import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
 import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
 import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
 import OpenInTabIcon from "../../../../images/open-in-tab.svg";
+import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
 import SettingsIcon from "../../../../images/settings_15x15.svg";
 import SynapseIcon from "../../../../images/synapse-link.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
-import { Platform, configContext } from "../../../ConfigContext";
+import { configContext, Platform } from "../../../ConfigContext";
 import * as ViewModels from "../../../Contracts/ViewModels";
+import { useSidePanel } from "../../../hooks/useSidePanel";
 import { JunoClient } from "../../../Juno/JunoClient";
 import { userContext } from "../../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
 import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
-import { useSidePanel } from "../../../hooks/useSidePanel";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
@@ -36,7 +35,7 @@ import { GitHubReposPanel } from "../../Panes/GitHubReposPanel/GitHubReposPanel"
 import { LoadQueryPane } from "../../Panes/LoadQueryPane/LoadQueryPane";
 import { SettingsPane } from "../../Panes/SettingsPane/SettingsPane";
 import { useDatabases } from "../../useDatabases";
-import { SelectedNodeState, useSelectedNode } from "../../useSelectedNode";
+import { SelectedNodeState } from "../../useSelectedNode";

 let counter = 0;

@@ -145,9 +144,7 @@ export function createStaticCommandBarButtons(
        commandButtonLabel: label,
        ariaLabel: label,
        hasPopup: true,
-        disabled:
-          useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-          selectedNodeState.isDatabaseNodeOrNoneSelected(),
+        disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
      };

      newStoredProcedureBtn.children = createScriptCommandButtons(selectedNodeState);
@@ -268,7 +265,6 @@ function createNewCollectionGroup(container: Explorer): CommandButtonComponentPr
    ariaLabel: label,
    hasPopup: true,
    id: "createNewContainerCommandButton",
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
  };
 }

@@ -293,8 +289,7 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
    onCommandClick: () => container.openEnableSynapseLinkDialog(),
    commandButtonLabel: label,
    hasPopup: false,
-    disabled:
-      useSelectedNode.getState().isQueryCopilotCollectionSelected() || useNotebook.getState().isSynapseLinkUpdating,
+    disabled: useNotebook.getState().isSynapseLinkUpdating,
    ariaLabel: label,
  };
 }
@@ -314,7 +309,6 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
    commandButtonLabel: label,
    ariaLabel: label,
    hasPopup: true,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
  };
 }

@@ -326,12 +320,8 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
      iconSrc: AddSqlQueryIcon,
      iconAlt: label,
      onCommandClick: () => {
-        if (useSelectedNode.getState().isQueryCopilotCollectionSelected()) {
-          useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
-        } else {
-          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
-        }
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
      },
      commandButtonLabel: label,
      ariaLabel: label,
@@ -376,9 +366,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
      commandButtonLabel: label,
      ariaLabel: label,
      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
    };
    buttons.push(newStoredProcedureBtn);
  }
@@ -395,9 +383,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
      commandButtonLabel: label,
      ariaLabel: label,
      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
    };
    buttons.push(newUserDefinedFunctionBtn);
  }
@@ -414,9 +400,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
      commandButtonLabel: label,
      ariaLabel: label,
      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
    };
    buttons.push(newTriggerBtn);
  }
@@ -440,7 +424,7 @@ function createNewNotebookButton(container: Explorer): CommandButtonComponentPro
    onCommandClick: () => container.onNewNotebookClicked(),
    commandButtonLabel: label,
    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
    ariaLabel: label,
  };
 }
@@ -453,7 +437,7 @@ function createuploadNotebookButton(container: Explorer): CommandButtonComponent
    onCommandClick: () => container.openUploadFilePanel(),
    commandButtonLabel: label,
    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
    ariaLabel: label,
  };
 }
@@ -468,7 +452,7 @@ function createOpenQueryButton(container: Explorer): CommandButtonComponentProps
    commandButtonLabel: label,
    ariaLabel: label,
    hasPopup: true,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
  };
 }

@@ -481,7 +465,7 @@ function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
    commandButtonLabel: label,
    ariaLabel: label,
    hasPopup: true,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
  };
 }

@@ -545,8 +529,7 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
 function createOpenPsqlTerminalButton(container: Explorer): CommandButtonComponentProps {
  const label = "Open PSQL Shell";
  const disableButton =
-    (!useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled) ||
-    useSelectedNode.getState().isQueryCopilotCollectionSelected();
+    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
  return {
    iconSrc: HostedTerminalIcon,
    iconAlt: label,
@@ -573,7 +556,7 @@ function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonC
    onCommandClick: () => container.resetNotebookWorkspace(),
    commandButtonLabel: label,
    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
    ariaLabel: label,
  };
 }
@@ -599,7 +582,7 @@ function createManageGitHubAccountButton(container: Explorer): CommandButtonComp
    },
    commandButtonLabel: label,
    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    disabled: false,
    ariaLabel: label,
  };
 }
--- a/src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
+++ b/src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
@@ -5,18 +5,18 @@
 import { Dropdown, IDropdownOption } from "@fluentui/react";
 import * as React from "react";
 import AnimateHeight from "react-animate-height";
-import ClearIcon from "../../../../images/Clear-1.svg";
-import ChevronDownIcon from "../../../../images/QueryBuilder/CollapseChevronDown_16x.png";
-import ChevronUpIcon from "../../../../images/QueryBuilder/CollapseChevronUp_16x.png";
 import LoaderIcon from "../../../../images/circular_loader_black_16x16.gif";
+import ClearIcon from "../../../../images/Clear-1.svg";
 import ErrorBlackIcon from "../../../../images/error_black.svg";
 import ErrorRedIcon from "../../../../images/error_red.svg";
 import infoBubbleIcon from "../../../../images/info-bubble-9x9.svg";
 import InfoIcon from "../../../../images/info_color.svg";
 import LoadingIcon from "../../../../images/loading.svg";
+import ChevronDownIcon from "../../../../images/QueryBuilder/CollapseChevronDown_16x.png";
+import ChevronUpIcon from "../../../../images/QueryBuilder/CollapseChevronUp_16x.png";
 import { ClientDefaults, KeyCodes } from "../../../Common/Constants";
-import { userContext } from "../../../UserContext";
 import { useNotificationConsole } from "../../../hooks/useNotificationConsole";
+import { userContext } from "../../../UserContext";
 import { ConsoleData, ConsoleDataType } from "./ConsoleData";

 export interface NotificationConsoleComponentProps {
@@ -256,7 +256,6 @@ export class NotificationConsoleComponent extends React.Component<
    if (this.props.isConsoleExpanded && this.consoleHeaderElement) {
      this.consoleHeaderElement.focus();
    }
-    useNotificationConsole.getState().setConsoleAnimationFinished(true);
  };

  private updateConsoleData = (prevProps: NotificationConsoleComponentProps): void => {
--- a/src/Explorer/Notebook/NotebookComponent/epics.ts
+++ b/src/Explorer/Notebook/NotebookComponent/epics.ts
@@ -1,23 +1,23 @@
 import {
+  actions,
  AppState,
+  castToSessionId,
  ContentRef,
+  createKernelRef,
  JupyterHostRecordProps,
-  ServerConfig as JupyterServerConfig,
  KernelInfo,
  KernelRef,
  RemoteKernelProps,
-  actions,
-  castToSessionId,
-  createKernelRef,
  selectors,
+  ServerConfig as JupyterServerConfig,
 } from "@nteract/core";
-import { Channels, childOf, createMessage, message, ofMessageType } from "@nteract/messaging";
+import { Channels, childOf, createMessage, JupyterMessage, message, ofMessageType } from "@nteract/messaging";
 import { defineConfigOption } from "@nteract/mythic-configuration";
 import { RecordOf } from "immutable";
 import { Action, AnyAction } from "redux";
-import { StateObservable, ofType } from "redux-observable";
+import { ofType, StateObservable } from "redux-observable";
 import { kernels, sessions } from "rx-jupyter";
-import { EMPTY, Observable, Observer, Subject, Subscriber, concat, from, interval, merge, of, timer } from "rxjs";
+import { concat, EMPTY, from, interval, merge, Observable, Observer, of, Subject, Subscriber, timer } from "rxjs";
 import {
  catchError,
  concatMap,
@@ -35,17 +35,17 @@ import {
 import { webSocket } from "rxjs/webSocket";
 import * as Constants from "../../../Common/Constants";
 import { Areas } from "../../../Common/Constants";
-import { ActionModifiers, Action as TelemetryAction } from "../../../Shared/Telemetry/TelemetryConstants";
+import { useTabs } from "../../../hooks/useTabs";
+import { Action as TelemetryAction, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { logConsoleError, logConsoleInfo } from "../../../Utils/NotificationConsoleUtils";
-import { useTabs } from "../../../hooks/useTabs";
 import { useDialog } from "../../Controls/Dialog";
 import * as FileSystemUtil from "../FileSystemUtil";
 import * as cdbActions from "../NotebookComponent/actions";
 import { NotebookContentProviderType, NotebookUtil } from "../NotebookUtil";
 import * as CdbActions from "./actions";
 import * as TextFile from "./contents/file/text-file";
-import { CdbAppState, JupyterMessage } from "./types";
+import { CdbAppState } from "./types";

 interface NotebookServiceConfig extends JupyterServerConfig {
  userPuid?: string;
@@ -106,8 +106,10 @@ const formWebSocketURL = (serverConfig: NotebookServiceConfig, kernelId: string,
  if (sessionId) {
    params.append("session_id", sessionId);
  }
+
  const q = params.toString();
  const suffix = q !== "" ? `?${q}` : "";
+
  const url = (serverConfig.endpoint.slice(0, -1) || "") + `api/kernels/${kernelId}/channels${suffix}`;

  return url.replace(/^http(s)?/, "ws$1");
@@ -239,10 +241,10 @@ const connect = (serverConfig: NotebookServiceConfig, kernelID: string, sessionI
            ...message,
            header: {
              session: sessionID,
-              token: serverConfig.token,
              ...message.header,
            },
          };
+
          wsSubject.next(sessionizedMessage);
        } else {
          console.error("Message must be an object, the app sent", message);
--- a/src/Explorer/Notebook/NotebookComponent/types.ts
+++ b/src/Explorer/Notebook/NotebookComponent/types.ts
@@ -1,6 +1,5 @@
 import { CellId } from "@nteract/commutable";
 import { AppState } from "@nteract/core";
-import { MessageType } from "@nteract/messaging";
 import * as Immutable from "immutable";
 import { Notebook } from "../../../Common/Constants";

@@ -54,26 +53,3 @@ export const makeCdbRecord = Immutable.Record<CdbRecordProps>({
  pendingSnapshotRequest: undefined,
  notebookSnapshotError: undefined,
 });
-
-export interface JupyterMessage<MT extends MessageType = MessageType, C = any> {
-  header: JupyterMessageHeader<MT>;
-  parent_header:
-    | JupyterMessageHeader<any>
-    | {
-        msg_id?: string;
-      };
-  metadata: object;
-  content: C;
-  channel: string;
-  buffers?: Uint8Array | null;
-}
-
-export interface JupyterMessageHeader<MT extends MessageType = MessageType> {
-  msg_id: string;
-  username: string;
-  date: string;
-  msg_type: MT;
-  version: string;
-  session: string;
-  token: string;
-}
--- a/src/Explorer/Panes/PanelContainerComponent.tsx
+++ b/src/Explorer/Panes/PanelContainerComponent.tsx
@@ -8,7 +8,6 @@ export interface PanelContainerProps {
  panelContent?: JSX.Element;
  isConsoleExpanded: boolean;
  isOpen: boolean;
-  isConsoleAnimationFinished?: boolean;
  panelWidth?: string;
  onRenderNavigationContent?: IRenderFunction<IPanelProps>;
 }
@@ -29,7 +28,7 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
    };
  }

-  omponentDidMount(): void {
+  componentDidMount(): void {
    window.addEventListener("resize", () => this.setState({ height: this.getPanelHeight() }));
  }

@@ -37,15 +36,6 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
    window.removeEventListener("resize", () => this.setState({ height: this.getPanelHeight() }));
  }

-  componentDidUpdate(): void {
-    if (useNotificationConsole.getState().consoleAnimationFinished || this.state.height !== this.getPanelHeight()) {
-      this.setState({
-        height: this.getPanelHeight(),
-      });
-      useNotificationConsole.getState().setConsoleAnimationFinished(false);
-    }
-  }
-
  render(): JSX.Element {
    if (!this.props.panelContent) {
      return <></>;
@@ -69,7 +59,7 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
          header: { padding: "0 0 8px 34px" },
          commands: { marginTop: 8 },
        }}
-        style={{ height: this.state.height }}
+        style={{ height: this.getPanelHeight() }}
      >
        {this.props.panelContent}
      </Panel>
@@ -85,22 +75,16 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
  };

  private getPanelHeight = (): string => {
-    const notificationConsole = document.getElementById("explorerNotificationConsole");
-    if (notificationConsole) {
-      return window.innerHeight - notificationConsole.clientHeight + "px";
-    }
-    return (
-      window.innerHeight -
-      (this.props.isConsoleExpanded
-        ? PanelContainerComponent.consoleContentHeight + PanelContainerComponent.consoleHeaderHeight
-        : PanelContainerComponent.consoleHeaderHeight) +
-      "px"
-    );
+    const consoleHeight = this.props.isConsoleExpanded
+      ? PanelContainerComponent.consoleContentHeight + PanelContainerComponent.consoleHeaderHeight
+      : PanelContainerComponent.consoleHeaderHeight;
+    const panelHeight = window.innerHeight - consoleHeight;
+    return panelHeight + "px";
  };
 }
+
 export const SidePanel: React.FC = () => {
  const isConsoleExpanded = useNotificationConsole((state) => state.isExpanded);
-  const isConsoleAnimationFinished = useNotificationConsole((state) => state.consoleAnimationFinished);
  const { isOpen, panelContent, panelWidth, headerText } = useSidePanel((state) => {
    return {
      isOpen: state.isOpen,
@@ -118,7 +102,6 @@ export const SidePanel: React.FC = () => {
      headerText={headerText}
      isConsoleExpanded={isConsoleExpanded}
      panelWidth={panelWidth}
-      isConsoleAnimationFinished={isConsoleAnimationFinished}
    />
  );
 };
--- a/src/Explorer/Panes/PanelFooterComponent.tsx
+++ b/src/Explorer/Panes/PanelFooterComponent.tsx
@@ -1,18 +1,16 @@
 import { PrimaryButton } from "@fluentui/react";
-import React, { CSSProperties } from "react";
+import React from "react";

 export interface PanelFooterProps {
  buttonLabel: string;
  isButtonDisabled?: boolean;
-  style?: CSSProperties;
 }

 export const PanelFooterComponent: React.FunctionComponent<PanelFooterProps> = ({
  buttonLabel,
  isButtonDisabled,
-  style,
 }: PanelFooterProps): JSX.Element => (
-  <div className="panelFooter" style={style}>
+  <div className="panelFooter">
    <PrimaryButton
      type="submit"
      id="sidePanelOkButton"
--- a/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
+++ b/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, FunctionComponent, ReactNode } from "react";
+import React, { FunctionComponent, ReactNode } from "react";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
@@ -11,7 +11,6 @@ export interface RightPaneFormProps {
  isSubmitButtonHidden?: boolean;
  isSubmitButtonDisabled?: boolean;
  children?: ReactNode;
-  footerStyle?: CSSProperties;
 }

 export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
@@ -22,7 +21,6 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
  isSubmitButtonHidden = false,
  isSubmitButtonDisabled = false,
  children,
-  footerStyle,
 }: RightPaneFormProps) => {
  const handleOnSubmit = (event: React.FormEvent<HTMLFormElement>) => {
    event.preventDefault();
@@ -35,11 +33,7 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
        {formError && <PanelInfoErrorComponent messageType="error" message={formError} showErrorDetails={true} />}
        {children}
        {!isSubmitButtonHidden && (
-          <PanelFooterComponent
-            buttonLabel={submitButtonText}
-            isButtonDisabled={isSubmitButtonDisabled}
-            style={footerStyle}
-          />
+          <PanelFooterComponent buttonLabel={submitButtonText} isButtonDisabled={isSubmitButtonDisabled} />
        )}
      </form>
      {isExecuting && <PanelLoadingScreen />}
--- a/src/Explorer/Panes/SaveQueryPane/SaveQueryPane.tsx
+++ b/src/Explorer/Panes/SaveQueryPane/SaveQueryPane.tsx
@@ -139,11 +139,10 @@ export const SaveQueryPane: FunctionComponent<SaveQueryPaneProps> = ({
    onSubmit: () => {
      isSaveQueryEnabled() ? submit() : setupQueries();
    },
-    footerStyle: isSaveQueryEnabled() ? { flexGrow: 0 } : {},
  };
  return (
    <RightPaneForm {...props}>
-      <div className="panelFormWrapper" style={{ flexGrow: 1 }}>
+      <div className="panelFormWrapper">
        <div className="panelMainContent">
          {!isSaveQueryEnabled() ? (
            <Text variant="small">{setupSaveQueriesText}</Text>
--- a/src/Explorer/Panes/SaveQueryPane/snapshots/SaveQueryPane.test.tsx.snap
+++ b/src/Explorer/Panes/SaveQueryPane/snapshots/SaveQueryPane.test.tsx.snap
@@ -2,7 +2,6 @@

 exports[`Save Query Pane should render Default properly 1`] = `
 <RightPaneForm
-  footerStyle={Object {}}
  formError=""
  isExecuting={false}
  onSubmit={[Function]}
@@ -10,11 +9,6 @@ exports[`Save Query Pane should render Default properly 1`] = `
 >
  <div
    className="panelFormWrapper"
-    style={
-      Object {
-        "flexGrow": 1,
-      }
-    }
  >
    <div
      className="panelMainContent"
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -2,12 +2,12 @@ import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
+import { useSidePanel } from "hooks/useSidePanel";
+import React, { FunctionComponent, MouseEvent, useState } from "react";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import * as StringUtility from "Shared/StringUtility";
 import { userContext } from "UserContext";
 import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
-import { useSidePanel } from "hooks/useSidePanel";
-import React, { FunctionComponent, MouseEvent, useState } from "react";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

 export const SettingsPane: FunctionComponent = () => {
@@ -29,7 +29,7 @@ export const SettingsPane: FunctionComponent = () => {
  const [crossPartitionQueryEnabled, setCrossPartitionQueryEnabled] = useState<boolean>(
    LocalStorageUtility.hasItem(StorageKey.IsCrossPartitionQueryEnabled)
      ? LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true"
-      : false
+      : true
  );
  const [graphAutoVizDisabled, setGraphAutoVizDisabled] = useState<string>(
    LocalStorageUtility.hasItem(StorageKey.IsGraphAutoVizDisabled)
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -142,7 +142,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </div>
        <StyledCheckboxBase
          ariaLabel="Enable cross partition query"
-          checked={false}
+          checked={true}
          className="padding"
          onChange={[Function]}
          styles={
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -295,9 +295,8 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
            className="addButtonEntiy"
            tabIndex={0}
            onKeyPress={handlekeypressaddentity}
-            aria-label="Add Property"
          >
-            <Image {...imageProps} src={AddPropertyIcon} alt="Add Property" />
+            <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
            <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
          </Stack>
        )}
--- a/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
@@ -26,7 +26,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
        className="panelMainContent"
      >
        <Stack
-          aria-label="Add Property"
          className="addButtonEntiy"
          horizontal={true}
          onClick={[Function]}
@@ -34,21 +33,20 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
          tabIndex={0}
        >
          <div
-            aria-label="Add Property"
            className="ms-Stack addButtonEntiy css-53"
            onClick={[Function]}
            onKeyPress={[Function]}
            tabIndex={0}
          >
            <StyledImageBase
-              alt="Add Property"
+              alt="Add Entity"
              height={30}
              key=".0:$.0"
              src=""
              width={16}
            >
              <ImageBase
-                alt="Add Property"
+                alt="Add Entity"
                height={30}
                src=""
                styles={[Function]}
@@ -337,7 +335,7 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
                  }
                >
                  <img
-                    alt="Add Property"
+                    alt="Add Entity"
                    className="ms-Image-image ms-Image-image--portrait is-notLoaded is-fadeIn image-55"
                    key="fabricImage"
                    onError={[Function]}
--- a/src/Explorer/QueryCopilot/CopilotCarousel.tsx
+++ b/src/Explorer/QueryCopilot/CopilotCarousel.tsx
@@ -13,8 +13,11 @@ import {
 } from "@fluentui/react";
 import { QueryCopilotSampleDatabaseId, StyleConstants } from "Common/Constants";
 import { handleError } from "Common/ErrorHandlingUtils";
+import { createCollection } from "Common/dataAccess/createCollection";
+import * as DataModels from "Contracts/DataModels";
 import { ContainerSampleGenerator } from "Explorer/DataSamples/ContainerSampleGenerator";
 import Explorer from "Explorer/Explorer";
+import { AllPropertiesIndexed } from "Explorer/Panes/AddCollectionPanel";
 import { PromptCard } from "Explorer/QueryCopilot/PromptCard";
 import { useDatabases } from "Explorer/useDatabases";
 import { useCarousel } from "hooks/useCarousel";
@@ -75,27 +78,30 @@ export const QueryCopilotCarousel: React.FC<QueryCopilotCarouselProps> = ({
  };

  const createSampleDatabase = async (): Promise<void> => {
-    // const database = useDatabases.getState().findDatabaseWithId(QueryCopilotSampleDatabaseId);
+    const database = useDatabases.getState().findDatabaseWithId(QueryCopilotSampleDatabaseId);
+    if (database) {
+      return;
+    }

    try {
-      // setIsCreatingDatabase(true);
-      // setSpinnerText("Setting up your database...");
-      // const params: DataModels.CreateCollectionParams = {
-      //   createNewDatabase: false,
-      //   collectionId: "SampleContainer",
-      //   databaseId: QueryCopilotSampleDatabaseId,
-      //   databaseLevelThroughput: true,
-      //   autoPilotMaxThroughput: 1000,
-      //   offerThroughput: undefined,
-      //   indexingPolicy: AllPropertiesIndexed,
-      //   partitionKey: {
-      //     paths: ["/categoryId"],
-      //     kind: "Hash",
-      //     version: 2,
-      //   },
-      // };
-      // await createCollection(params);
-      // await explorer.refreshAllDatabases();
+      setIsCreatingDatabase(true);
+      setSpinnerText("Setting up your database...");
+      const params: DataModels.CreateCollectionParams = {
+        createNewDatabase: true,
+        collectionId: "SampleContainer",
+        databaseId: QueryCopilotSampleDatabaseId,
+        databaseLevelThroughput: true,
+        autoPilotMaxThroughput: 1000,
+        offerThroughput: undefined,
+        indexingPolicy: AllPropertiesIndexed,
+        partitionKey: {
+          paths: ["/categoryId"],
+          kind: "Hash",
+          version: 2,
+        },
+      };
+      await createCollection(params);
+      await explorer.refreshAllDatabases();
      const database = useDatabases.getState().findDatabaseWithId(QueryCopilotSampleDatabaseId);
      await database.loadCollections();
      const collection = database.findCollectionWithId("SampleContainer");
--- a/src/Explorer/QueryCopilot/Modal/WelcomeModal.css
+++ b/src/Explorer/QueryCopilot/Modal/WelcomeModal.css
@@ -1,47 +0,0 @@
-.modalContentPadding {
-  padding-top: 15px;
-  width: 513px;
-  height: 638px;
-}
-
-.exitPadding {
-  padding: 0px 7px 0px 0px;
-}
-
-.previewMargin {
-  margin: 8px 10px 0px 0;
-}
-
-.preview {
-  padding: 0px 4px;
-  background: #f0f0f0;
-  border-radius: 8px;
-  font-size: 10px;
-}
-
-.exitIcon {
-  margin: 3px 7px 0px 0px;
-  color: #424242;
-}
-
-.text {
-  width: 348px;
-  padding: 8px 16px 8px 16px;
-  margin-left: 25px;
-}
-
-.bold {
-  font-weight: 600;
-}
-
-.imageTextPadding {
-  padding: 0px 5px 0px 0px;
-}
-
-.buttonPadding {
-  padding: 15px 0px 0px 0px;
-}
-
-.tryButton {
-  border-radius: 4px;
-}
--- a/src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx
+++ b/src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx
@@ -1,114 +0,0 @@
-import { IconButton, Image, Link, Modal, PrimaryButton, Stack, StackItem, Text } from "@fluentui/react";
-import { useBoolean } from "@fluentui/react-hooks";
-import React from "react";
-import Database from "../../../../images/CopilotDatabase.svg";
-import Flash from "../../../../images/CopilotFlash.svg";
-import Thumb from "../../../../images/CopilotThumb.svg";
-import CoplilotWelcomeIllustration from "../../../../images/CopliotWelcomeIllustration.svg";
-import "./WelcomeModal.css";
-
-export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element => {
-  const [isModalVisible, { setFalse: hideModal }] = useBoolean(visible);
-
-  React.useEffect(() => {
-    if (visible) {
-      window.localStorage.setItem("hideWelcomeModal", "true");
-    }
-  });
-
-  return (
-    <>
-      <Modal isOpen={isModalVisible} onDismiss={hideModal} isBlocking={false}>
-        <Stack className="modalContentPadding">
-          <Stack horizontal>
-            <Stack horizontal grow={4} horizontalAlign="end">
-              <Stack.Item>
-                <Image src={CoplilotWelcomeIllustration} />
-              </Stack.Item>
-            </Stack>
-            <Stack horizontal grow={1} horizontalAlign="end" verticalAlign="start" className="exitPadding">
-              <Stack.Item className="previewMargin">
-                <Text className="preview">Preview</Text>
-              </Stack.Item>
-              <Stack.Item>
-                <IconButton
-                  onClick={hideModal}
-                  iconProps={{ iconName: "Cancel" }}
-                  title="Exit"
-                  ariaLabel="Exit"
-                  className="exitIcon"
-                />
-              </Stack.Item>
-            </Stack>
-          </Stack>
-          <Stack horizontalAlign="center">
-            <Stack.Item align="center">
-              <Text className="title bold">Welcome to Copilot in CosmosDB</Text>
-            </Stack.Item>
-            <Stack.Item align="center" className="text">
-              <Stack horizontal>
-                <StackItem align="start" className="imageTextPadding">
-                  <Image src={Flash} />
-                </StackItem>
-                <StackItem align="start">
-                  <Text className="bold">
-                    Let copilot do the work for you
-                    <br />
-                  </Text>
-                </StackItem>
-              </Stack>
-              <Text>
-                Ask Copilot to generate a query by describing the query in your words.
-                <br />
-                <Link href="">Learn more</Link>
-              </Text>
-            </Stack.Item>
-            <Stack.Item align="center" className="text">
-              <Stack horizontal>
-                <StackItem align="start" className="imageTextPadding">
-                  <Image src={Thumb} />
-                </StackItem>
-                <StackItem align="start">
-                  <Text className="bold">
-                    Use your judgement
-                    <br />
-                  </Text>
-                </StackItem>
-              </Stack>
-              <Text>
-                AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
-                <br />
-                <Link href="">Read preview terms</Link>
-              </Text>
-            </Stack.Item>
-            <Stack.Item align="center" className="text">
-              <Stack horizontal>
-                <StackItem align="start" className="imageTextPadding">
-                  <Image src={Database} />
-                </StackItem>
-                <StackItem align="start">
-                  <Text className="bold">
-                    Copilot currently works only a sample database
-                    <br />
-                  </Text>
-                </StackItem>
-              </Stack>
-              <Text>
-                Copilot is setup on a sample database we have configured for you at no cost
-                <br />
-                <Link href="">Learn more</Link>
-              </Text>
-            </Stack.Item>
-          </Stack>
-          <Stack className="buttonPadding">
-            <Stack.Item align="center">
-              <PrimaryButton onClick={hideModal} className="tryButton">
-                Try Copilot
-              </PrimaryButton>
-            </Stack.Item>
-          </Stack>
-        </Stack>
-      </Modal>
-    </>
-  );
-};
--- a/src/Explorer/QueryCopilot/Popup/CopyPopup.test.tsx
+++ b/src/Explorer/QueryCopilot/Popup/CopyPopup.test.tsx
@@ -1,11 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { any } from "underscore";
-import { CopyPopup } from "./CopyPopup";
-
-describe("Copy Popup snapshot test", () => {
-  it("should render when showCopyPopup is true", () => {
-    const wrapper = shallow(<CopyPopup showCopyPopup={true} setShowCopyPopup={() => any} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/Explorer/QueryCopilot/Popup/CopyPopup.tsx
+++ b/src/Explorer/QueryCopilot/Popup/CopyPopup.tsx
@@ -1,63 +0,0 @@
-import { IconButton, Image, Stack, Text } from "@fluentui/react";
-import React, { Dispatch, SetStateAction } from "react";
-import Success from "../../../../images/successfulPopup.svg";
-
-export const CopyPopup = ({
-  showCopyPopup,
-  setShowCopyPopup,
-}: {
-  showCopyPopup: boolean;
-  setShowCopyPopup: Dispatch<SetStateAction<boolean>>;
-}): JSX.Element => {
-  const closePopup = () => {
-    setShowCopyPopup(false);
-  };
-
-  return showCopyPopup ? (
-    <Stack
-      style={{
-        position: "fixed",
-        width: 345,
-        height: 66,
-        padding: 10,
-        gap: 5,
-        top: 75,
-        right: 20,
-        background: "#FFFFFF",
-        boxShadow: "0 2px 6px rgba(0, 0, 0, 0.16)",
-      }}
-    >
-      <Stack
-        horizontal
-        verticalAlign="center"
-        style={{ display: "flex", justifyContent: "space-between", padding: "5px, 2px, 0px, 0px" }}
-      >
-        <Stack horizontal verticalAlign="center" style={{ display: "flex", gap: 10 }}>
-          <Image style={{ width: 15, height: 15 }} src={Success} />
-          <Text>
-            <b>Code copied successfully</b>
-          </Text>
-        </Stack>
-        <IconButton
-          styles={{
-            root: {
-              border: "none",
-              backgroundColor: "transparent",
-              padding: 0,
-              selectors: {
-                "&:focus": {
-                  outline: "none",
-                },
-              },
-            },
-          }}
-          iconProps={{ iconName: "Cancel" }}
-          onClick={closePopup}
-        />
-      </Stack>
-      <Text style={{ marginTop: -10 }}>The query has been copied to the clipboard</Text>
-    </Stack>
-  ) : (
-    <></>
-  );
-};
--- a/src/Explorer/QueryCopilot/Popup/DeletePopup.test.tsx
+++ b/src/Explorer/QueryCopilot/Popup/DeletePopup.test.tsx
@@ -1,19 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { any } from "underscore";
-import { DeletePopup } from "./DeletePopup";
-
-describe("Delete Popup snapshot test", () => {
-  it("should render when showDeletePopup is true", () => {
-    const wrapper = shallow(
-      <DeletePopup
-        showDeletePopup={true}
-        setShowDeletePopup={() => any}
-        setQuery={() => any}
-        clearFeedback={() => any}
-        showFeedbackBar={() => any}
-      />
-    );
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
+++ b/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
@@ -1,44 +0,0 @@
-import { DefaultButton, Modal, PrimaryButton, Stack, Text } from "@fluentui/react";
-import React, { Dispatch, SetStateAction } from "react";
-
-export const DeletePopup = ({
-  showDeletePopup,
-  setShowDeletePopup,
-  setQuery,
-  clearFeedback,
-  showFeedbackBar,
-}: {
-  showDeletePopup: boolean;
-  setShowDeletePopup: Dispatch<SetStateAction<boolean>>;
-  setQuery: Dispatch<SetStateAction<string>>;
-  clearFeedback: Dispatch<SetStateAction<void>>;
-  showFeedbackBar: Dispatch<SetStateAction<boolean>>;
-}): JSX.Element => {
-  const deleteCode = () => {
-    setQuery("");
-    setShowDeletePopup(false);
-    clearFeedback();
-    showFeedbackBar(false);
-  };
-
-  return (
-    <Modal isOpen={showDeletePopup} styles={{ main: { minHeight: "122px", minWidth: "880px" } }}>
-      <Stack style={{ padding: "16px 24px", height: "auto" }}>
-        <Text style={{ height: 24, fontSize: "18px" }}>
-          <b>Delete code?</b>
-        </Text>
-        <Text style={{ marginTop: 10, marginBottom: 20 }}>
-          This will clear the query from the query builder pane along with all comments and also reset the prompt pane
-        </Text>
-        <Stack horizontal tokens={{ childrenGap: 10 }} horizontalAlign="start">
-          <PrimaryButton style={{ padding: "0px 20px", height: 24 }} onClick={deleteCode}>
-            Delete
-          </PrimaryButton>
-          <DefaultButton style={{ padding: "0px 20px", height: 24 }} onClick={() => setShowDeletePopup(false)}>
-            Close
-          </DefaultButton>
-        </Stack>
-      </Stack>
-    </Modal>
-  );
-};
--- a/src/Explorer/QueryCopilot/Popup/snapshots/CopyPopup.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Popup/snapshots/CopyPopup.test.tsx.snap
@@ -1,88 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Copy Popup snapshot test should render when showCopyPopup is true 1`] = `
-<Stack
-  style={
-    Object {
-      "background": "#FFFFFF",
-      "boxShadow": "0 2px 6px rgba(0, 0, 0, 0.16)",
-      "gap": 5,
-      "height": 66,
-      "padding": 10,
-      "position": "fixed",
-      "right": 20,
-      "top": 75,
-      "width": 345,
-    }
-  }
->
-  <Stack
-    horizontal={true}
-    style={
-      Object {
-        "display": "flex",
-        "justifyContent": "space-between",
-        "padding": "5px, 2px, 0px, 0px",
-      }
-    }
-    verticalAlign="center"
-  >
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "display": "flex",
-          "gap": 10,
-        }
-      }
-      verticalAlign="center"
-    >
-      <Image
-        src=""
-        style={
-          Object {
-            "height": 15,
-            "width": 15,
-          }
-        }
-      />
-      <Text>
-        <b>
-          Code copied successfully
-        </b>
-      </Text>
-    </Stack>
-    <CustomizedIconButton
-      iconProps={
-        Object {
-          "iconName": "Cancel",
-        }
-      }
-      onClick={[Function]}
-      styles={
-        Object {
-          "root": Object {
-            "backgroundColor": "transparent",
-            "border": "none",
-            "padding": 0,
-            "selectors": Object {
-              "&:focus": Object {
-                "outline": "none",
-              },
-            },
-          },
-        }
-      }
-    />
-  </Stack>
-  <Text
-    style={
-      Object {
-        "marginTop": -10,
-      }
-    }
-  >
-    The query has been copied to the clipboard
-  </Text>
-</Stack>
-`;
--- a/src/Explorer/QueryCopilot/Popup/snapshots/DeletePopup.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Popup/snapshots/DeletePopup.test.tsx.snap
@@ -1,79 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Delete Popup snapshot test should render when showDeletePopup is true 1`] = `
-<Modal
-  isOpen={true}
-  styles={
-    Object {
-      "main": Object {
-        "minHeight": "122px",
-        "minWidth": "880px",
-      },
-    }
-  }
->
-  <Stack
-    style={
-      Object {
-        "height": "auto",
-        "padding": "16px 24px",
-      }
-    }
-  >
-    <Text
-      style={
-        Object {
-          "fontSize": "18px",
-          "height": 24,
-        }
-      }
-    >
-      <b>
-        Delete code?
-      </b>
-    </Text>
-    <Text
-      style={
-        Object {
-          "marginBottom": 20,
-          "marginTop": 10,
-        }
-      }
-    >
-      This will clear the query from the query builder pane along with all comments and also reset the prompt pane
-    </Text>
-    <Stack
-      horizontal={true}
-      horizontalAlign="start"
-      tokens={
-        Object {
-          "childrenGap": 10,
-        }
-      }
-    >
-      <CustomizedPrimaryButton
-        onClick={[Function]}
-        style={
-          Object {
-            "height": 24,
-            "padding": "0px 20px",
-          }
-        }
-      >
-        Delete
-      </CustomizedPrimaryButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "height": 24,
-            "padding": "0px 20px",
-          }
-        }
-      >
-        Close
-      </CustomizedDefaultButton>
-    </Stack>
-  </Stack>
-</Modal>
-`;
--- a/src/Explorer/QueryCopilot/QueryCopilotFeedbackModal.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotFeedbackModal.tsx
@@ -13,7 +13,6 @@ import {
 import { submitFeedback } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
-import { getUserEmail } from "../../Utils/UserUtils";

 export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
  const {
@@ -27,7 +26,6 @@ export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
  const [isContactAllowed, setIsContactAllowed] = React.useState<boolean>(true);
  const [description, setDescription] = React.useState<string>("");
  const [doNotShowAgainChecked, setDoNotShowAgainChecked] = React.useState<boolean>(false);
-  const [contact, setContact] = React.useState<string>(getUserEmail());
  return (
    <Modal isOpen={showFeedbackModal}>
      <Stack style={{ padding: 24 }}>
@@ -71,10 +69,7 @@ export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
            { key: "no", text: "No, do not contact me." },
          ]}
          selectedKey={isContactAllowed ? "yes" : "no"}
-          onChange={(_, option) => {
-            setIsContactAllowed(option.key === "yes");
-            setContact(option.key === "yes" ? getUserEmail() : "");
-          }}
+          onChange={(_, option) => setIsContactAllowed(option.key === "yes")}
        ></ChoiceGroup>
        <Text style={{ fontSize: 12, marginBottom: 14 }}>
          By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your
@@ -97,7 +92,7 @@ export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
            onClick={() => {
              closeFeedbackModal();
              setHideFeedbackModalForLikedQueries(doNotShowAgainChecked);
-              submitFeedback({ generatedQuery, likeQuery, description, userPrompt, contact });
+              submitFeedback({ generatedQuery, likeQuery, description, userPrompt });
            }}
          >
            Submit
--- a/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
@@ -1,22 +1,18 @@
 /* eslint-disable no-console */
-import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { FeedOptions } from "@azure/cosmos";
 import {
  Callout,
  CommandBarButton,
-  DefaultButton,
  DirectionalHint,
-  IButtonStyles,
  IconButton,
  Image,
  Link,
  Separator,
  Spinner,
  Stack,
-  TeachingBubble,
  Text,
  TextField,
 } from "@fluentui/react";
-import { useBoolean } from "@fluentui/react-hooks";
 import {
  QueryCopilotSampleContainerId,
  QueryCopilotSampleContainerSchema,
@@ -25,8 +21,7 @@ import {
 import { getErrorMessage, handleError } from "Common/ErrorHandlingUtils";
 import { shouldEnableCrossPartitionKey } from "Common/HeadersUtility";
 import { MinimalQueryIterator } from "Common/IteratorUtilities";
-import { sampleDataClient } from "Common/SampleDataClient";
-import { getCommonQueryOptions } from "Common/dataAccess/queryDocuments";
+import { queryDocuments } from "Common/dataAccess/queryDocuments";
 import { queryDocumentsPage } from "Common/dataAccess/queryDocumentsPage";
 import { QueryResults } from "Contracts/ViewModels";
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
@@ -34,31 +29,16 @@ import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import Explorer from "Explorer/Explorer";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { SaveQueryPane } from "Explorer/Panes/SaveQueryPane/SaveQueryPane";
-import { WelcomeModal } from "Explorer/QueryCopilot/Modal/WelcomeModal";
-import { CopyPopup } from "Explorer/QueryCopilot/Popup/CopyPopup";
-import { DeletePopup } from "Explorer/QueryCopilot/Popup/DeletePopup";
 import { submitFeedback } from "Explorer/QueryCopilot/QueryCopilotUtilities";
-import { SamplePrompts, SamplePromptsProps } from "Explorer/QueryCopilot/SamplePrompts/SamplePrompts";
 import { QueryResultSection } from "Explorer/Tabs/QueryTab/QueryResultSection";
-import { userContext } from "UserContext";
 import { queryPagesUntilContentPresent } from "Utils/QueryUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
-import React, { useRef, useState } from "react";
+import React, { useState } from "react";
 import SplitterLayout from "react-splitter-layout";
+import CopilotIcon from "../../../images/Copilot.svg";
 import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
-import HintIcon from "../../../images/Hint.svg";
-import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
-import RecentIcon from "../../../images/Recent.svg";
-import SamplePromptsIcon from "../../../images/SamplePromptsIcon.svg";
-import XErrorMessage from "../../../images/X-errorMessage.svg";
 import SaveQueryIcon from "../../../images/save-cosmos.svg";
-import { useTabs } from "../../hooks/useTabs";
-
-interface SuggestedPrompt {
-  id: number;
-  text: string;
-}

 interface QueryCopilotTabProps {
  initialInput: string;
@@ -73,103 +53,30 @@ interface GenerateSQLQueryResponse {
  generateEnd: string;
 }

-const promptStyles: IButtonStyles = {
-  root: { border: 0, selectors: { ":hover": { outline: "1px dashed #605e5c" } } },
-  label: { fontWeight: 400, textAlign: "left", paddingLeft: 8 },
-};
-
 export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
  initialInput,
  explorer,
 }: QueryCopilotTabProps): JSX.Element => {
  const hideFeedbackModalForLikedQueries = useQueryCopilot((state) => state.hideFeedbackModalForLikedQueries);
-  const [userPrompt, setUserPrompt] = useState<string>(initialInput || "");
+  const [userInput, setUserInput] = useState<string>(initialInput || "");
  const [generatedQuery, setGeneratedQuery] = useState<string>("");
  const [query, setQuery] = useState<string>("");
  const [selectedQuery, setSelectedQuery] = useState<string>("");
  const [isGeneratingQuery, setIsGeneratingQuery] = useState<boolean>(false);
  const [isExecuting, setIsExecuting] = useState<boolean>(false);
  const [likeQuery, setLikeQuery] = useState<boolean>();
-  const [dislikeQuery, setDislikeQuery] = useState<boolean>();
  const [showCallout, setShowCallout] = useState<boolean>(false);
-  const [showSamplePrompts, setShowSamplePrompts] = useState<boolean>(false);
  const [queryIterator, setQueryIterator] = useState<MinimalQueryIterator>();
  const [queryResults, setQueryResults] = useState<QueryResults>();
  const [errorMessage, setErrorMessage] = useState<string>("");
-  const [copilotTeachingBubbleVisible, { toggle: toggleCopilotTeachingBubbleVisible }] = useBoolean(false);
-  const inputEdited = useRef(false);
-  const [isSamplePromptsOpen, setIsSamplePromptsOpen] = useState<boolean>(false);
-  const [showDeletePopup, setShowDeletePopup] = useState<boolean>(false);
-  const [showFeedbackBar, setShowFeedbackBar] = useState<boolean>(false);
-  const [showCopyPopup, setshowCopyPopup] = useState<boolean>(false);
-  const [showErrorMessageBar, setShowErrorMessageBar] = useState<boolean>(false);
-
-  const sampleProps: SamplePromptsProps = {
-    isSamplePromptsOpen: isSamplePromptsOpen,
-    setIsSamplePromptsOpen: setIsSamplePromptsOpen,
-    setTextBox: setUserPrompt,
-  };
-
-  const copyGeneratedCode = () => {
-    if (!query) {
-      return;
-    }
-    const queryElement = document.createElement("textarea");
-    queryElement.value = query;
-    document.body.appendChild(queryElement);
-    queryElement.select();
-    document.execCommand("copy");
-    document.body.removeChild(queryElement);
-
-    setshowCopyPopup(true);
-    setTimeout(() => {
-      setshowCopyPopup(false);
-    }, 6000);
-  };
-
-  const cachedHistoriesString = localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotHistories`);
-  const cachedHistories = cachedHistoriesString?.split(",");
-  const [histories, setHistories] = useState<string[]>(cachedHistories || []);
-  const suggestedPrompts: SuggestedPrompt[] = [
-    { id: 1, text: "Give me all customers whose names start with C" },
-    { id: 2, text: "Show me all customers" },
-    { id: 3, text: "Show me all customers who bought a bike in 2019" },
-  ];
-  const [filteredHistories, setFilteredHistories] = useState<string[]>(histories);
-  const [filteredSuggestedPrompts, setFilteredSuggestedPrompts] = useState<SuggestedPrompt[]>(suggestedPrompts);
-
-  const handleUserPromptChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    inputEdited.current = true;
-    const { value } = event.target;
-    setUserPrompt(value);
-
-    // Filter history prompts
-    const filteredHistory = histories.filter((history) => history.toLowerCase().includes(value.toLowerCase()));
-    setFilteredHistories(filteredHistory);
-
-    // Filter suggested prompts
-    const filteredSuggested = suggestedPrompts.filter((prompt) =>
-      prompt.text.toLowerCase().includes(value.toLowerCase())
-    );
-    setFilteredSuggestedPrompts(filteredSuggested);
-  };
-
-  const updateHistories = (): void => {
-    const newHistories = histories.length < 3 ? [userPrompt, ...histories] : [userPrompt, histories[1], histories[2]];
-    setHistories(newHistories);
-    localStorage.setItem(`${userContext.databaseAccount.id}-queryCopilotHistories`, newHistories.join(","));
-  };

  const generateSQLQuery = async (): Promise<void> => {
    try {
      setIsGeneratingQuery(true);
-      useTabs.getState().setIsTabExecuting(true);
-      useTabs.getState().setIsQueryErrorThrown(false);
      const payload = {
        containerSchema: QueryCopilotSampleContainerSchema,
-        userPrompt: userPrompt,
+        userPrompt: userInput,
      };
-      setShowDeletePopup(false);
      const response = await fetch("https://copilotorchestrater.azurewebsites.net/generateSQLQuery", {
        method: "POST",
        headers: {
@@ -180,9 +87,10 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({

      const generateSQLQueryResponse: GenerateSQLQueryResponse = await response?.json();
      if (generateSQLQueryResponse?.sql) {
-        let query = `-- **Prompt:** ${userPrompt}\r\n`;
+        let query = `-- ${userInput}\r\n`;
        if (generateSQLQueryResponse.explanation) {
-          query += `-- **Explanation of query:** ${generateSQLQueryResponse.explanation}\r\n`;
+          query += "-- **Explanation of query**\r\n";
+          query += `-- ${generateSQLQueryResponse.explanation}\r\n`;
        }
        query += generateSQLQueryResponse.sql;
        setQuery(query);
@@ -190,27 +98,15 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
      }
    } catch (error) {
      handleError(error, "executeNaturalLanguageQuery");
-      useTabs.getState().setIsQueryErrorThrown(true);
-      setShowErrorMessageBar(true);
      throw error;
    } finally {
      setIsGeneratingQuery(false);
-      useTabs.getState().setIsTabExecuting(false);
-      setShowFeedbackBar(true);
    }
  };

-  const querySampleDocuments = (query: string, options: FeedOptions): QueryIterator<ItemDefinition & Resource> => {
-    options = getCommonQueryOptions(options);
-    return sampleDataClient()
-      .database(QueryCopilotSampleDatabaseId)
-      .container(QueryCopilotSampleContainerId)
-      .items.query(query, options);
-  };
-
  const onExecuteQueryClick = async (): Promise<void> => {
    const queryToExecute = selectedQuery || query;
-    const queryIterator = querySampleDocuments(queryToExecute, {
+    const queryIterator = queryDocuments(QueryCopilotSampleDatabaseId, QueryCopilotSampleContainerId, queryToExecute, {
      enableCrossPartitionQuery: shouldEnableCrossPartitionKey(),
    } as FeedOptions);
    setQueryIterator(queryIterator);
@@ -223,8 +119,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
  const queryDocumentsPerPage = async (firstItemIndex: number, queryIterator: MinimalQueryIterator): Promise<void> => {
    try {
      setIsExecuting(true);
-      useTabs.getState().setIsTabExecuting(true);
-      useTabs.getState().setIsQueryErrorThrown(false);
      const queryResults: QueryResults = await queryPagesUntilContentPresent(
        firstItemIndex,
        async (firstItemIndex: number) =>
@@ -237,11 +131,8 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
      const errorMessage = getErrorMessage(error);
      setErrorMessage(errorMessage);
      handleError(errorMessage, "executeQueryCopilotTab");
-      useTabs.getState().setIsQueryErrorThrown(true);
-      setShowErrorMessageBar(true);
    } finally {
      setIsExecuting(false);
-      useTabs.getState().setIsTabExecuting(false);
    }
  };

@@ -266,32 +157,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
      hasPopup: false,
    };

-    const samplePromptsBtn = {
-      iconSrc: SamplePromptsIcon,
-      iconAlt: "Sample Prompts",
-      onCommandClick: () => setIsSamplePromptsOpen(true),
-      commandButtonLabel: "Sample Prompts",
-      ariaLabel: "Sample Prompts",
-      hasPopup: false,
-    };
-
-    return [executeQueryBtn, saveQueryBtn, samplePromptsBtn];
-  };
-  const showTeachingBubble = (): void => {
-    if (!inputEdited.current) {
-      setTimeout(() => {
-        if (!inputEdited.current) {
-          toggleCopilotTeachingBubbleVisible();
-          inputEdited.current = true;
-        }
-      }, 30000);
-    }
-  };
-
-  const resetButtonState = () => {
-    setDislikeQuery(false);
-    setLikeQuery(false);
-    setShowCallout(false);
+    return [executeQueryBtn, saveQueryBtn];
  };

  React.useEffect(() => {
@@ -302,8 +168,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
    if (initialInput) {
      generateSQLQuery();
    }
-    showTeachingBubble();
-    useTabs.getState().setIsQueryErrorThrown(false);
  }, []);

  return (
@@ -312,231 +176,80 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
        <Image src={CopilotIcon} />
        <Text style={{ marginLeft: 8, fontWeight: 600, fontSize: 16 }}>Copilot</Text>
      </Stack>
-      <Stack horizontal verticalAlign="center" style={{ marginTop: 16, width: "100%", position: "relative" }}>
+      <Stack horizontal verticalAlign="center" style={{ marginTop: 16, width: "100%" }}>
        <TextField
-          id="naturalLanguageInput"
-          value={userPrompt}
-          onChange={handleUserPromptChange}
-          onClick={() => {
-            inputEdited.current = true;
-            setShowSamplePrompts(true);
-          }}
+          value={userInput}
+          onChange={(_, newValue) => setUserInput(newValue)}
          style={{ lineHeight: 30 }}
-          styles={{ root: { width: "95%" } }}
+          styles={{ root: { width: "90%" } }}
          disabled={isGeneratingQuery}
-          autoComplete="off"
        />
-        {copilotTeachingBubbleVisible && (
-          <TeachingBubble
-            calloutProps={{ directionalHint: DirectionalHint.bottomCenter }}
-            target="#naturalLanguageInput"
-            hasCloseButton={true}
-            closeButtonAriaLabel="Close"
-            onDismiss={toggleCopilotTeachingBubbleVisible}
-            hasSmallHeadline={true}
-            headline="Write a prompt"
-          >
-            Write a prompt here and Copilot will generate the query for you. You can also choose from our{" "}
-            <Link
-              onClick={() => {
-                setShowSamplePrompts(true);
-                toggleCopilotTeachingBubbleVisible();
-              }}
-              style={{ color: "white", fontWeight: 600 }}
-            >
-              sample prompts
-            </Link>{" "}
-            or write your own query
-          </TeachingBubble>
-        )}
        <IconButton
          iconProps={{ iconName: "Send" }}
-          disabled={isGeneratingQuery || !userPrompt.trim()}
+          disabled={isGeneratingQuery}
          style={{ marginLeft: 8 }}
-          onClick={() => {
-            updateHistories();
-            generateSQLQuery();
-            resetButtonState();
-          }}
+          onClick={() => generateSQLQuery()}
        />
        {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
-        {showSamplePrompts && (
-          <Callout
-            styles={{ root: { minWidth: 400 } }}
-            target="#naturalLanguageInput"
-            isBeakVisible={false}
-            onDismiss={() => setShowSamplePrompts(false)}
-            directionalHintFixed={true}
-            directionalHint={DirectionalHint.bottomLeftEdge}
-            alignTargetEdge={true}
-            gapSpace={4}
-          >
-            <Stack>
-              {filteredHistories?.length > 0 && (
-                <Stack>
-                  <Text
-                    style={{
-                      width: "100%",
-                      fontSize: 14,
-                      fontWeight: 600,
-                      color: "#0078D4",
-                      marginLeft: 16,
-                      padding: "4px 0",
-                    }}
-                  >
-                    Recent
-                  </Text>
-                  {filteredHistories.map((history, i) => (
-                    <DefaultButton
-                      key={i}
-                      onClick={() => {
-                        setUserPrompt(history);
-                        setShowSamplePrompts(false);
-                      }}
-                      onRenderIcon={() => <Image src={RecentIcon} />}
-                      styles={promptStyles}
-                    >
-                      {history}
-                    </DefaultButton>
-                  ))}
-                </Stack>
-              )}
-              <Text
-                style={{
-                  width: "100%",
-                  fontSize: 14,
-                  fontWeight: 600,
-                  color: "#0078D4",
-                  marginLeft: 16,
-                  padding: "4px 0",
-                }}
-              >
-                Suggested Prompts
-              </Text>
-              {filteredSuggestedPrompts.map((prompt) => (
-                <DefaultButton
-                  key={prompt.id}
-                  onClick={() => {
-                    setUserPrompt(prompt.text);
-                    setShowSamplePrompts(false);
-                  }}
-                  onRenderIcon={() => <Image src={HintIcon} />}
-                  styles={promptStyles}
-                >
-                  {prompt.text}
-                </DefaultButton>
-              ))}
-              <Separator
-                styles={{
-                  root: {
-                    selectors: { "::before": { background: "#E1DFDD" } },
-                    padding: 0,
-                  },
-                }}
-              />
-              <Text
-                style={{
-                  width: "100%",
-                  fontSize: 14,
-                  marginLeft: 16,
-                  padding: "4px 0",
-                }}
-              >
-                Learn about{" "}
-                <Link target="_blank" href="">
-                  writing effective prompts
-                </Link>
-              </Text>
-            </Stack>
-          </Callout>
-        )}
      </Stack>
-
      <Text style={{ marginTop: 8, marginBottom: 24, fontSize: 12 }}>
        AI-generated content can have mistakes. Make sure it&apos;s accurate and appropriate before using it.{" "}
        <Link href="" target="_blank">
          Read preview terms
        </Link>
-        {showErrorMessageBar && (
-          <Stack style={{ backgroundColor: "#FEF0F1", padding: "4px 8px" }} horizontal verticalAlign="center">
-            <Image src={XErrorMessage} style={{ marginRight: "8px" }} />
-            <Text style={{ fontSize: 12 }}>
-              We ran into an error and were not able to execute query. Please try again after sometime
-            </Text>
-          </Stack>
-        )}
      </Text>

-      {showFeedbackBar && (
-        <Stack style={{ backgroundColor: "#FFF8F0", padding: "2px 8px" }} horizontal verticalAlign="center">
-          <Text style={{ fontWeight: 600, fontSize: 12 }}>Provide feedback on the query generated</Text>
-          {showCallout && !hideFeedbackModalForLikedQueries && (
-            <Callout
-              style={{ padding: 8 }}
-              target="#likeBtn"
-              onDismiss={() => {
-                setShowCallout(false);
-                submitFeedback({ generatedQuery, likeQuery, description: "", userPrompt: userPrompt });
-              }}
-              directionalHint={DirectionalHint.topCenter}
-            >
-              <Text>
-                Thank you. Need to give{" "}
-                <Link
-                  onClick={() => {
-                    setShowCallout(false);
-                    useQueryCopilot.getState().openFeedbackModal(generatedQuery, true, userPrompt);
-                  }}
-                >
-                  more feedback?
-                </Link>
-              </Text>
-            </Callout>
-          )}
-          <IconButton
-            id="likeBtn"
-            style={{ marginLeft: 20 }}
-            iconProps={{ iconName: likeQuery === true ? "LikeSolid" : "Like" }}
-            onClick={() => {
-              setShowCallout(!likeQuery);
-              setLikeQuery(!likeQuery);
-              if (dislikeQuery) {
-                setDislikeQuery(!dislikeQuery);
-              }
-            }}
-          />
-          <IconButton
-            style={{ margin: "0 10px" }}
-            iconProps={{ iconName: dislikeQuery === true ? "DislikeSolid" : "Dislike" }}
-            onClick={() => {
-              if (!dislikeQuery) {
-                useQueryCopilot.getState().openFeedbackModal(generatedQuery, false, userPrompt);
-                setLikeQuery(false);
-              }
-              setDislikeQuery(!dislikeQuery);
+      <Stack style={{ backgroundColor: "#FFF8F0", padding: "2px 8px" }} horizontal verticalAlign="center">
+        <Text style={{ fontWeight: 600, fontSize: 12 }}>Provide feedback on the query generated</Text>
+        {showCallout && !hideFeedbackModalForLikedQueries && (
+          <Callout
+            style={{ padding: 8 }}
+            target="#likeBtn"
+            onDismiss={() => {
              setShowCallout(false);
+              submitFeedback({ generatedQuery, likeQuery, description: "", userPrompt: userInput });
            }}
-          />
-          <Separator vertical style={{ color: "#EDEBE9" }} />
-          <CommandBarButton
-            onClick={copyGeneratedCode}
-            iconProps={{ iconName: "Copy" }}
-            style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
+            directionalHint={DirectionalHint.topCenter}
          >
-            Copy code
-          </CommandBarButton>
-          <CommandBarButton
-            onClick={() => {
-              setShowDeletePopup(true);
-            }}
-            iconProps={{ iconName: "Delete" }}
-            style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
-          >
-            Delete code
-          </CommandBarButton>
-        </Stack>
-      )}
-
+            <Text>
+              Thank you. Need to give{" "}
+              <Link
+                onClick={() => {
+                  setShowCallout(false);
+                  useQueryCopilot.getState().openFeedbackModal(generatedQuery, true, userInput);
+                }}
+              >
+                more feedback?
+              </Link>
+            </Text>
+          </Callout>
+        )}
+        <IconButton
+          id="likeBtn"
+          style={{ marginLeft: 20 }}
+          iconProps={{ iconName: likeQuery === true ? "LikeSolid" : "Like" }}
+          onClick={() => {
+            setLikeQuery(true);
+            setShowCallout(true);
+          }}
+        />
+        <IconButton
+          style={{ margin: "0 10px" }}
+          iconProps={{ iconName: likeQuery === false ? "DislikeSolid" : "Dislike" }}
+          onClick={() => {
+            setLikeQuery(false);
+            setShowCallout(false);
+            useQueryCopilot.getState().openFeedbackModal(generatedQuery, false, userInput);
+          }}
+        />
+        <Separator vertical style={{ color: "#EDEBE9" }} />
+        <CommandBarButton iconProps={{ iconName: "Copy" }} style={{ margin: "0 10px", backgroundColor: "#FFF8F0" }}>
+          Copy code
+        </CommandBarButton>
+        <CommandBarButton iconProps={{ iconName: "Delete" }} style={{ backgroundColor: "#FFF8F0" }}>
+          Delete code
+        </CommandBarButton>
+      </Stack>
      <Stack className="tabPaneContentContainer">
        <SplitterLayout vertical={true} primaryIndex={0} primaryMinSize={100} secondaryMinSize={200}>
          <EditorReact
@@ -558,18 +271,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
          />
        </SplitterLayout>
      </Stack>
-      <WelcomeModal visible={localStorage.getItem("hideWelcomeModal") !== "true"} />
-      {isSamplePromptsOpen && <SamplePrompts sampleProps={sampleProps} />}
-      {query !== "" && query.trim().length !== 0 && (
-        <DeletePopup
-          showDeletePopup={showDeletePopup}
-          setShowDeletePopup={setShowDeletePopup}
-          setQuery={setQuery}
-          clearFeedback={resetButtonState}
-          showFeedbackBar={setShowFeedbackBar}
-        />
-      )}
-      <CopyPopup showCopyPopup={showCopyPopup} setShowCopyPopup={setshowCopyPopup} />
    </Stack>
  );
 };
--- a/src/Explorer/QueryCopilot/SamplePrompts/SamplePrompts.test.tsx
+++ b/src/Explorer/QueryCopilot/SamplePrompts/SamplePrompts.test.tsx
@@ -1,26 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { SamplePrompts, SamplePromptsProps } from "./SamplePrompts";
-
-describe("Sample Prompts snapshot test", () => {
-  it("should render properly if isSamplePromptsOpen is true", () => {
-    const sampleProps: SamplePromptsProps = {
-      isSamplePromptsOpen: true,
-      setIsSamplePromptsOpen: () => undefined,
-      setTextBox: () => undefined,
-    };
-
-    const wrapper = shallow(<SamplePrompts sampleProps={sampleProps} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("should render properly if isSamplePromptsOpen is false", () => {
-    const sampleProps: SamplePromptsProps = {
-      isSamplePromptsOpen: false,
-      setIsSamplePromptsOpen: () => undefined,
-      setTextBox: () => undefined,
-    };
-    const wrapper = shallow(<SamplePrompts sampleProps={sampleProps} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/Explorer/QueryCopilot/SamplePrompts/SamplePrompts.tsx
+++ b/src/Explorer/QueryCopilot/SamplePrompts/SamplePrompts.tsx
@@ -1,138 +0,0 @@
-import { DefaultButton, FontIcon, IconButton, Image, Modal, Stack, Text } from "@fluentui/react";
-import React, { Dispatch, SetStateAction } from "react";
-import ComplexPrompts from "../../../../images/ComplexPrompts.svg";
-import IntermediatePrompts from "../../../../images/IntermediatePrompts.svg";
-import SimplePrompts from "../../../../images/SimplePrompts.svg";
-
-export interface SamplePromptsProps {
-  isSamplePromptsOpen: boolean;
-  setIsSamplePromptsOpen: Dispatch<SetStateAction<boolean>>;
-  setTextBox: Dispatch<SetStateAction<string>>;
-}
-
-const SampleUserInputs: string[] = [
-  "Show me products less than 100 dolars",
-  "Show schema",
-  "Show items with a description that contains a number between 0 and 99 inclusive.",
-  "Write a query to return all records in this table created in the last thirty days",
-  "Show all the products that customer Bob has reviewed.",
-  "Which computers are more than 300 dollars and less than 400 dollars?",
-];
-
-export const SamplePrompts = ({ sampleProps }: { sampleProps: SamplePromptsProps }): JSX.Element => {
-  const updateTextBox = (userInput: string) => {
-    sampleProps.setTextBox(userInput);
-    sampleProps.setIsSamplePromptsOpen(false);
-  };
-
-  return (
-    <Modal isOpen={sampleProps.isSamplePromptsOpen}>
-      <Stack
-        style={{ padding: "16px 24px", overflowY: "auto", maxHeight: "calc(100vh - 120px)" }}
-        role="dialog"
-        aria-modal="true"
-      >
-        <Stack>
-          <Stack horizontal style={{ display: "flex", justifyContent: "space-between" }}>
-            <Text style={{ fontSize: 24, fontWeight: 600 }}>Sample Prompts</Text>
-            <IconButton
-              styles={{
-                root: {
-                  border: "none",
-                  backgroundColor: "transparent",
-                  padding: 0,
-                  selectors: {
-                    "&:hover": {
-                      backgroundColor: "transparent",
-                      color: "#000", // Set the desired color for the X button on hover
-                    },
-                    "&:focus": {
-                      outline: "none",
-                    },
-                  },
-                },
-              }}
-              iconProps={{ iconName: "Cancel" }}
-              onClick={() => sampleProps.setIsSamplePromptsOpen(false)}
-            />
-          </Stack>
-          <Text style={{ fontWeight: 400, fontSize: 13, marginTop: 10 }}>
-            Here are some sample prompts for writing queries in NoSQL, ranging from simple to complex
-          </Text>
-        </Stack>
-
-        <Stack style={{ marginTop: 30, display: "flex" }}>
-          <Stack horizontal verticalAlign="center">
-            <Image style={{ width: 25, height: 25 }} src={SimplePrompts} />
-            <Text style={{ fontSize: 14, fontWeight: 600 }}>Simple Prompts</Text>
-          </Stack>
-        </Stack>
-
-        <Stack horizontal style={{ gap: 35 }}>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[0])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[0]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[1])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[1]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-        </Stack>
-
-        <Stack style={{ marginTop: 30, display: "flex" }}>
-          <Stack horizontal verticalAlign="center">
-            <Image style={{ width: 25, height: 25 }} src={IntermediatePrompts} />
-            <Text style={{ fontSize: 14, fontWeight: 600 }}>Intermediate Prompts</Text>
-          </Stack>
-        </Stack>
-
-        <Stack horizontal style={{ gap: 35 }}>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[2])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[2]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[3])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[3]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-        </Stack>
-
-        <Stack style={{ marginTop: 30, display: "flex" }}>
-          <Stack horizontal verticalAlign="center">
-            <Image style={{ width: 25, height: 25 }} src={ComplexPrompts} />
-            <Text style={{ fontSize: 14, fontWeight: 600 }}>Complex Prompts</Text>
-          </Stack>
-        </Stack>
-
-        <Stack horizontal style={{ gap: 35 }}>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[4])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[4]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-          <DefaultButton
-            style={{ width: 352, height: 135, background: "#F6F6F7" }}
-            onClick={() => updateTextBox(SampleUserInputs[5])}
-          >
-            <Text style={{ height: 80, fontSize: 13 }}>{SampleUserInputs[5]}</Text>
-            <FontIcon style={{ position: "absolute", left: "92.61%" }} aria-label="Forward" iconName="Forward" />
-          </DefaultButton>
-        </Stack>
-      </Stack>
-    </Modal>
-  );
-};
--- a/src/Explorer/QueryCopilot/SamplePrompts/snapshots/SamplePrompts.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/SamplePrompts/snapshots/SamplePrompts.test.tsx.snap
@@ -1,781 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Sample Prompts snapshot test should render properly if isSamplePromptsOpen is false 1`] = `
-<Modal
-  isOpen={false}
->
-  <Stack
-    aria-modal="true"
-    role="dialog"
-    style={
-      Object {
-        "maxHeight": "calc(100vh - 120px)",
-        "overflowY": "auto",
-        "padding": "16px 24px",
-      }
-    }
-  >
-    <Stack>
-      <Stack
-        horizontal={true}
-        style={
-          Object {
-            "display": "flex",
-            "justifyContent": "space-between",
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 24,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Sample Prompts
-        </Text>
-        <CustomizedIconButton
-          iconProps={
-            Object {
-              "iconName": "Cancel",
-            }
-          }
-          onClick={[Function]}
-          styles={
-            Object {
-              "root": Object {
-                "backgroundColor": "transparent",
-                "border": "none",
-                "padding": 0,
-                "selectors": Object {
-                  "&:focus": Object {
-                    "outline": "none",
-                  },
-                  "&:hover": Object {
-                    "backgroundColor": "transparent",
-                    "color": "#000",
-                  },
-                },
-              },
-            }
-          }
-        />
-      </Stack>
-      <Text
-        style={
-          Object {
-            "fontSize": 13,
-            "fontWeight": 400,
-            "marginTop": 10,
-          }
-        }
-      >
-        Here are some sample prompts for writing queries in NoSQL, ranging from simple to complex
-      </Text>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Simple Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show me products less than 100 dolars
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show schema
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Intermediate Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show items with a description that contains a number between 0 and 99 inclusive.
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Write a query to return all records in this table created in the last thirty days
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Complex Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show all the products that customer Bob has reviewed.
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Which computers are more than 300 dollars and less than 400 dollars?
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-  </Stack>
-</Modal>
-`;
-
-exports[`Sample Prompts snapshot test should render properly if isSamplePromptsOpen is true 1`] = `
-<Modal
-  isOpen={true}
->
-  <Stack
-    aria-modal="true"
-    role="dialog"
-    style={
-      Object {
-        "maxHeight": "calc(100vh - 120px)",
-        "overflowY": "auto",
-        "padding": "16px 24px",
-      }
-    }
-  >
-    <Stack>
-      <Stack
-        horizontal={true}
-        style={
-          Object {
-            "display": "flex",
-            "justifyContent": "space-between",
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 24,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Sample Prompts
-        </Text>
-        <CustomizedIconButton
-          iconProps={
-            Object {
-              "iconName": "Cancel",
-            }
-          }
-          onClick={[Function]}
-          styles={
-            Object {
-              "root": Object {
-                "backgroundColor": "transparent",
-                "border": "none",
-                "padding": 0,
-                "selectors": Object {
-                  "&:focus": Object {
-                    "outline": "none",
-                  },
-                  "&:hover": Object {
-                    "backgroundColor": "transparent",
-                    "color": "#000",
-                  },
-                },
-              },
-            }
-          }
-        />
-      </Stack>
-      <Text
-        style={
-          Object {
-            "fontSize": 13,
-            "fontWeight": 400,
-            "marginTop": 10,
-          }
-        }
-      >
-        Here are some sample prompts for writing queries in NoSQL, ranging from simple to complex
-      </Text>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Simple Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show me products less than 100 dolars
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show schema
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Intermediate Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show items with a description that contains a number between 0 and 99 inclusive.
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Write a query to return all records in this table created in the last thirty days
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-    <Stack
-      style={
-        Object {
-          "display": "flex",
-          "marginTop": 30,
-        }
-      }
-    >
-      <Stack
-        horizontal={true}
-        verticalAlign="center"
-      >
-        <Image
-          src=""
-          style={
-            Object {
-              "height": 25,
-              "width": 25,
-            }
-          }
-        />
-        <Text
-          style={
-            Object {
-              "fontSize": 14,
-              "fontWeight": 600,
-            }
-          }
-        >
-          Complex Prompts
-        </Text>
-      </Stack>
-    </Stack>
-    <Stack
-      horizontal={true}
-      style={
-        Object {
-          "gap": 35,
-        }
-      }
-    >
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Show all the products that customer Bob has reviewed.
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-      <CustomizedDefaultButton
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#F6F6F7",
-            "height": 135,
-            "width": 352,
-          }
-        }
-      >
-        <Text
-          style={
-            Object {
-              "fontSize": 13,
-              "height": 80,
-            }
-          }
-        >
-          Which computers are more than 300 dollars and less than 400 dollars?
-        </Text>
-        <FontIcon
-          aria-label="Forward"
-          iconName="Forward"
-          style={
-            Object {
-              "left": "92.61%",
-              "position": "absolute",
-            }
-          }
-        />
-      </CustomizedDefaultButton>
-    </Stack>
-  </Stack>
-</Modal>
-`;
--- a/src/Explorer/QueryCopilot/snapshots/QueryCopilotTab.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/snapshots/QueryCopilotTab.test.tsx.snap
@@ -35,18 +35,14 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
    style={
      Object {
        "marginTop": 16,
-        "position": "relative",
        "width": "100%",
      }
    }
    verticalAlign="center"
  >
    <StyledTextFieldBase
-      autoComplete="off"
      disabled={false}
-      id="naturalLanguageInput"
      onChange={[Function]}
-      onClick={[Function]}
      style={
        Object {
          "lineHeight": 30,
@@ -55,7 +51,7 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
      styles={
        Object {
          "root": Object {
-            "width": "95%",
+            "width": "90%",
          },
        }
      }
@@ -94,6 +90,91 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
      Read preview terms
    </StyledLinkBase>
  </Text>
+  <Stack
+    horizontal={true}
+    style={
+      Object {
+        "backgroundColor": "#FFF8F0",
+        "padding": "2px 8px",
+      }
+    }
+    verticalAlign="center"
+  >
+    <Text
+      style={
+        Object {
+          "fontSize": 12,
+          "fontWeight": 600,
+        }
+      }
+    >
+      Provide feedback on the query generated
+    </Text>
+    <CustomizedIconButton
+      iconProps={
+        Object {
+          "iconName": "Like",
+        }
+      }
+      id="likeBtn"
+      onClick={[Function]}
+      style={
+        Object {
+          "marginLeft": 20,
+        }
+      }
+    />
+    <CustomizedIconButton
+      iconProps={
+        Object {
+          "iconName": "Dislike",
+        }
+      }
+      onClick={[Function]}
+      style={
+        Object {
+          "margin": "0 10px",
+        }
+      }
+    />
+    <Separator
+      style={
+        Object {
+          "color": "#EDEBE9",
+        }
+      }
+      vertical={true}
+    />
+    <CustomizedCommandBarButton
+      iconProps={
+        Object {
+          "iconName": "Copy",
+        }
+      }
+      style={
+        Object {
+          "backgroundColor": "#FFF8F0",
+          "margin": "0 10px",
+        }
+      }
+    >
+      Copy code
+    </CustomizedCommandBarButton>
+    <CustomizedCommandBarButton
+      iconProps={
+        Object {
+          "iconName": "Delete",
+        }
+      }
+      style={
+        Object {
+          "backgroundColor": "#FFF8F0",
+        }
+      }
+    >
+      Delete code
+    </CustomizedCommandBarButton>
+  </Stack>
  <Stack
    className="tabPaneContentContainer"
  >
@@ -126,12 +207,5 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
      />
    </t>
  </Stack>
-  <WelcomeModal
-    visible={true}
-  />
-  <CopyPopup
-    setShowCopyPopup={[Function]}
-    showCopyPopup={false}
-  />
 </Stack>
 `;
--- a/src/Explorer/Quickstart/QuickstartCarousel.tsx
+++ b/src/Explorer/Quickstart/QuickstartCarousel.tsx
@@ -1,10 +1,10 @@
 import { DefaultButton, IconButton, Image, Modal, PrimaryButton, Stack, Text } from "@fluentui/react";
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { traceSuccess } from "Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "UserContext";
 import { useCarousel } from "hooks/useCarousel";
 import React, { useState } from "react";
 import Youtube from "react-youtube";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import { traceSuccess } from "Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "UserContext";
 import Image1 from "../../../images/CarouselImage1.svg";
 import Image2 from "../../../images/CarouselImage2.svg";

@@ -25,7 +25,7 @@ export const QuickstartCarousel: React.FC<QuickstartCarouselProps> = ({
      <Stack>
        <Stack horizontal horizontalAlign="space-between" style={{ padding: 16 }}>
          <Text variant="xLarge">{getHeaderText(page)}</Text>
-          <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => setPage(4)} ariaLabel="Close" />
+          <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => setPage(4)} />
        </Stack>
        {getContent(page)}
        <Text variant="medium" style={{ padding: "0 16px" }}>
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -23,10 +23,10 @@ import { ReactTabKind, useTabs } from "hooks/useTabs";
 import * as React from "react";
 import ConnectIcon from "../../../images/Connect_color.svg";
 import ContainersIcon from "../../../images/Containers.svg";
+import CopilotIcon from "../../../images/Copilot.svg";
 import LinkIcon from "../../../images/Link_blue.svg";
 import NotebookColorIcon from "../../../images/Notebooks.svg";
 import PowerShellIcon from "../../../images/PowerShell.svg";
-import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
 import QuickStartIcon from "../../../images/Quickstart_Lightning.svg";
 import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
 import CollectionIcon from "../../../images/tree-collection.svg";
--- a/src/Explorer/Tabs/QueryTablesTab.html
+++ b/src/Explorer/Tabs/QueryTablesTab.html
@@ -77,13 +77,7 @@
          <div class="addClause" data-bind=" ">
            <div class="addClause-heading">
              <span class="clause-table addClause-title">
-                <img
-                  class="addclauseProperty-Img"
-                  style="margin-bottom: 5px"
-                  src="/Add-property.svg"
-                  alt="Add new Clause"
-                  role="presentation"
-                />
+                <img class="addclauseProperty-Img" style="margin-bottom: 5px" src="/Add-property.svg" />
                <span style="margin-left: 5px" data-bind="text: addNewClauseLine"></span>
              </span>
            </div>
@@ -125,12 +119,7 @@
            aria-label="Show top results"
          />
          <div role="alert" aria-atomic="true" class="inline-div" data-bind="visible: isExceedingLimit">
-            <img
-              class="advanced-options-icon"
-              src="/QueryBuilder/StatusWarning_16x.png"
-              alt="Warning"
-              role="presentation"
-            />
+            <img class="advanced-options-icon" src="/QueryBuilder/StatusWarning_16x.png" />
            <span data-bind="text: topValueLimitMessage"></span>
          </div>
        </div>
--- a/src/Explorer/Tabs/QuickstartTab.tsx
+++ b/src/Explorer/Tabs/QuickstartTab.tsx
@@ -32,7 +32,7 @@ export const QuickstartTab: React.FC<QuickstartTabProps> = ({ explorer }: Quicks
      host: configContext.ARM_ENDPOINT,
      path: firewallRulesUri,
      method: "GET",
-      apiVersion: "2022-11-08",
+      apiVersion: "2020-10-05-privatepreview",
    });
    const firewallRules: PostgresFirewallRule[] = response?.data?.value || response?.value || [];
    const isEnabled = firewallRules.some(
--- a/src/Explorer/Tabs/Tabs.tsx
+++ b/src/Explorer/Tabs/Tabs.tsx
@@ -14,7 +14,6 @@ import ko from "knockout";
 import React, { MutableRefObject, useEffect, useRef, useState } from "react";
 import loadingIcon from "../../../images/circular_loader_black_16x16.gif";
 import errorIcon from "../../../images/close-black.svg";
-import errorQuery from "../../../images/error_no_outline.svg";
 import { useObservable } from "../../hooks/useObservable";
 import { ReactTabKind, useTabs } from "../../hooks/useTabs";
 import TabsBase from "./TabsBase";
@@ -114,17 +113,9 @@ function TabNav({ tab, active, tabKind }: { tab?: Tab; active: boolean; tabKind?
        <div className="tab_Content">
          <span className="statusIconContainer" style={{ width: tabKind === ReactTabKind.Home ? 0 : 18 }}>
            {useObservable(tab?.isExecutionError || ko.observable(false)) && <ErrorIcon tab={tab} active={active} />}
-            {isTabExecuting(tab, tabKind) && (
+            {useObservable(tab?.isExecuting || ko.observable(false)) && (
              <img className="loadingIcon" title="Loading" src={loadingIcon} alt="Loading" />
            )}
-            {isQueryErrorThrown(tab, tabKind) && (
-              <img
-                src={errorQuery}
-                title="Error"
-                alt="Error"
-                style={{ marginTop: 4, marginLeft: 4, width: 10, height: 11 }}
-              />
-            )}
          </span>
          <span className="tabNavText">{useObservable(tab?.tabTitle || getReactTabTitle())}</span>
          {tabKind !== ReactTabKind.Home && (
@@ -220,28 +211,6 @@ const onKeyPressReactTab = (e: KeyboardEvent, tabKind: ReactTabKind): void => {
  }
 };

-const isTabExecuting = (tab?: Tab, tabKind?: ReactTabKind): boolean => {
-  if (useObservable(tab?.isExecuting || ko.observable(false))) {
-    return true;
-  } else if (tabKind !== undefined && tabKind !== ReactTabKind.Home && useTabs.getState()?.isTabExecuting) {
-    return true;
-  }
-  return false;
-};
-
-const isQueryErrorThrown = (tab?: Tab, tabKind?: ReactTabKind): boolean => {
-  if (
-    !tab?.isExecuting &&
-    tabKind !== undefined &&
-    tabKind !== ReactTabKind.Home &&
-    useTabs.getState()?.isQueryErrorThrown &&
-    !useTabs.getState()?.isTabExecuting
-  ) {
-    return true;
-  }
-  return false;
-};
-
 const getReactTabContent = (activeReactTab: ReactTabKind, explorer: Explorer): JSX.Element => {
  switch (activeReactTab) {
    case ReactTabKind.Connect:
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -134,7 +134,7 @@ export default class TerminalTab extends TabsBase {
      host: configContext.ARM_ENDPOINT,
      path: firewallRulesUri,
      method: "GET",
-      apiVersion: "2022-11-08",
+      apiVersion: "2020-10-05-privatepreview",
    });
    const firewallRules: DataModels.PostgresFirewallRule[] = response?.data?.value || response?.value || [];
    const isEnabled = firewallRules.some(
--- a/src/Explorer/Tree/ResourceTree.tsx
+++ b/src/Explorer/Tree/ResourceTree.tsx
@@ -1,15 +1,14 @@
 import { Callout, DirectionalHint, ICalloutProps, ILinkProps, Link, Stack, Text } from "@fluentui/react";
-import { SampleDataTree } from "Explorer/Tree/SampleDataTree";
-import { getItemName } from "Utils/APITypeUtils";
 import * as React from "react";
+import { getItemName } from "Utils/APITypeUtils";
 import shallow from "zustand/shallow";
 import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
-import GalleryIcon from "../../../images/GalleryIcon.svg";
 import DeleteIcon from "../../../images/delete.svg";
+import GalleryIcon from "../../../images/GalleryIcon.svg";
+import FileIcon from "../../../images/notebook/file-cosmos.svg";
 import CopyIcon from "../../../images/notebook/Notebook-copy.svg";
 import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg";
 import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
-import FileIcon from "../../../images/notebook/file-cosmos.svg";
 import PublishIcon from "../../../images/notebook/publish_content.svg";
 import RefreshIcon from "../../../images/refresh-cosmos.svg";
 import CollectionIcon from "../../../images/tree-collection.svg";
@@ -17,14 +16,14 @@ import { Areas, ConnectionStatusType, Notebook } from "../../Common/Constants";
 import { isPublicInternetAccessAllowed } from "../../Common/DatabaseAccountUtility";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
+import { useSidePanel } from "../../hooks/useSidePanel";
+import { useTabs } from "../../hooks/useTabs";
 import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
 import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import { isServerlessAccount } from "../../Utils/CapabilityUtils";
 import * as GitHubUtils from "../../Utils/GitHubUtils";
-import { useSidePanel } from "../../hooks/useSidePanel";
-import { useTabs } from "../../hooks/useTabs";
 import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFactory";
 import { AccordionComponent, AccordionItemComponent } from "../Controls/Accordion/AccordionComponent";
 import { useDialog } from "../Controls/Dialog";
@@ -765,67 +764,23 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
  };

  const dataRootNode = buildDataTree();
-  const isSampleDataEnabled = userContext.sampleDataConnectionInfo && userContext.apiType === "SQL";
-  const sampleDataResourceTokenCollection = useDatabases((state) => state.sampleDataResourceTokenCollection);

-  return (
-    <>
-      {!isNotebookEnabled && !isSampleDataEnabled && (
-        <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
-      )}
-      {isNotebookEnabled && !isSampleDataEnabled && (
-        <>
-          <AccordionComponent>
-            <AccordionItemComponent title={"DATA"} isExpanded={!gitHubNotebooksContentRoot}>
-              <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
-            </AccordionItemComponent>
-            <AccordionItemComponent title={"NOTEBOOKS"}>
-              <TreeComponent className="notebookResourceTree" rootNode={buildNotebooksTree()} />
-            </AccordionItemComponent>
-          </AccordionComponent>
+  if (isNotebookEnabled) {
+    return (
+      <>
+        <AccordionComponent>
+          <AccordionItemComponent title={"DATA"} isExpanded={!gitHubNotebooksContentRoot}>
+            <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
+          </AccordionItemComponent>
+          <AccordionItemComponent title={"NOTEBOOKS"}>
+            <TreeComponent className="notebookResourceTree" rootNode={buildNotebooksTree()} />
+          </AccordionItemComponent>
+        </AccordionComponent>

-          {buildGalleryCallout()}
-        </>
-      )}
-      {!isNotebookEnabled && isSampleDataEnabled && (
-        <>
-          <AccordionComponent>
-            <AccordionItemComponent
-              title={"MY DATA"}
-              isExpanded={!gitHubNotebooksContentRoot}
-              styles={{ maxHeight: 230 }}
-            >
-              <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
-            </AccordionItemComponent>
-            <AccordionItemComponent title={"SAMPLE DATA"}>
-              <SampleDataTree sampleDataResourceTokenCollection={sampleDataResourceTokenCollection} />
-            </AccordionItemComponent>
-          </AccordionComponent>
+        {buildGalleryCallout()}
+      </>
+    );
+  }

-          {buildGalleryCallout()}
-        </>
-      )}
-      {isNotebookEnabled && isSampleDataEnabled && (
-        <>
-          <AccordionComponent>
-            <AccordionItemComponent
-              title={"MY DATA"}
-              isExpanded={!gitHubNotebooksContentRoot}
-              styles={{ maxHeight: 130 }}
-            >
-              <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />
-            </AccordionItemComponent>
-            <AccordionItemComponent title={"SAMPLE DATA"}>
-              <SampleDataTree sampleDataResourceTokenCollection={sampleDataResourceTokenCollection} />
-            </AccordionItemComponent>
-            <AccordionItemComponent title={"NOTEBOOKS"}>
-              <TreeComponent className="notebookResourceTree" rootNode={buildNotebooksTree()} />
-            </AccordionItemComponent>
-          </AccordionComponent>
-
-          {buildGalleryCallout()}
-        </>
-      )}
-    </>
-  );
+  return <TreeComponent className="dataResourceTree" rootNode={dataRootNode} />;
 };
--- a/src/Explorer/Tree/SampleDataTree.tsx
+++ b/src/Explorer/Tree/SampleDataTree.tsx
@@ -1,64 +0,0 @@
-import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
-import TabsBase from "Explorer/Tabs/TabsBase";
-import { useSelectedNode } from "Explorer/useSelectedNode";
-import { useTabs } from "hooks/useTabs";
-import React, { useEffect, useState } from "react";
-import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
-import CollectionIcon from "../../../images/tree-collection.svg";
-import * as ViewModels from "../../Contracts/ViewModels";
-import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFactory";
-import { TreeComponent, TreeNode } from "../Controls/TreeComponent/TreeComponent";
-
-export const SampleDataTree = ({
-  sampleDataResourceTokenCollection,
-}: {
-  sampleDataResourceTokenCollection: ViewModels.CollectionBase;
-}): JSX.Element => {
-  const [root, setRoot] = useState<TreeNode | undefined>(undefined);
-
-  useEffect(() => {
-    if (sampleDataResourceTokenCollection) {
-      const updatedSampleTree: TreeNode = {
-        label: sampleDataResourceTokenCollection.databaseId,
-        isExpanded: false,
-        iconSrc: CosmosDBIcon,
-        className: "databaseHeader",
-        children: [
-          {
-            label: sampleDataResourceTokenCollection.id(),
-            iconSrc: CollectionIcon,
-            isExpanded: false,
-            className: "dataResourceTree",
-            contextMenu: ResourceTreeContextMenuButtonFactory.createSampleCollectionContextMenuButton(),
-            onClick: () => {
-              // Rewritten version of expandCollapseCollection
-              useSelectedNode.getState().setSelectedNode(sampleDataResourceTokenCollection);
-              useCommandBar.getState().setContextButtons([]);
-              useTabs().refreshActiveTab(
-                (tab: TabsBase) =>
-                  tab.collection?.id() === sampleDataResourceTokenCollection.id() &&
-                  tab.collection.databaseId === sampleDataResourceTokenCollection.databaseId
-              );
-            },
-            isSelected: () =>
-              useSelectedNode
-                .getState()
-                .isDataNodeSelected(
-                  sampleDataResourceTokenCollection.databaseId,
-                  sampleDataResourceTokenCollection.id()
-                ),
-            onContextMenuOpen: () => useSelectedNode.getState().setSelectedNode(sampleDataResourceTokenCollection),
-            children: [
-              {
-                label: "Items",
-              },
-            ],
-          },
-        ],
-      };
-      setRoot(updatedSampleTree);
-    }
-  }, [sampleDataResourceTokenCollection]);
-
-  return <TreeComponent className="dataResourceTree" rootNode={root || { label: "Sample data not initialized." }} />;
-};
--- a/src/Explorer/useDatabases.ts
+++ b/src/Explorer/useDatabases.ts
@@ -8,7 +8,6 @@ import { useSelectedNode } from "./useSelectedNode";
 interface DatabasesState {
  databases: ViewModels.Database[];
  resourceTokenCollection: ViewModels.CollectionBase;
-  sampleDataResourceTokenCollection: ViewModels.CollectionBase;
  updateDatabase: (database: ViewModels.Database) => void;
  addDatabases: (databases: ViewModels.Database[]) => void;
  deleteDatabase: (database: ViewModels.Database) => void;
@@ -29,7 +28,6 @@ interface DatabasesState {
 export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
  databases: [],
  resourceTokenCollection: undefined,
-  sampleDataResourceTokenCollection: undefined,
  updateDatabase: (updatedDatabase: ViewModels.Database) =>
    set((state) => {
      const updatedDatabases = state.databases.map((database: ViewModels.Database) => {
--- a/src/Explorer/useSelectedNode.ts
+++ b/src/Explorer/useSelectedNode.ts
@@ -1,8 +1,9 @@
-import { ConnectionStatusType, QueryCopilotSampleContainerId, QueryCopilotSampleDatabaseId } from "Common/Constants";
+import { ConnectionStatusType } from "Common/Constants";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import create, { UseStore } from "zustand";
 import * as ViewModels from "../Contracts/ViewModels";
 import { useTabs } from "../hooks/useTabs";
+
 export interface SelectedNodeState {
  selectedNode: ViewModels.TreeNode;
  setSelectedNode: (node: ViewModels.TreeNode) => void;
@@ -14,7 +15,6 @@ export interface SelectedNodeState {
    subnodeKinds?: ViewModels.CollectionTabKind[]
  ) => boolean;
  isConnectedToContainer: () => boolean;
-  isQueryCopilotCollectionSelected: () => boolean;
 }

 export const useSelectedNode: UseStore<SelectedNodeState> = create((set, get) => ({
@@ -65,15 +65,4 @@ export const useSelectedNode: UseStore<SelectedNodeState> = create((set, get) =>
  isConnectedToContainer: (): boolean => {
    return useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected;
  },
-  isQueryCopilotCollectionSelected: (): boolean => {
-    const selectedNode = get().selectedNode;
-    if (
-      selectedNode &&
-      selectedNode.id() === QueryCopilotSampleContainerId &&
-      (selectedNode as ViewModels.Collection)?.databaseId === QueryCopilotSampleDatabaseId
-    ) {
-      return true;
-    }
-    return false;
-  },
 }));
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -18,7 +18,6 @@ import "../externals/jquery.typeahead.min.js";
 // Image Dependencies
 import { QueryCopilotCarousel } from "Explorer/QueryCopilot/CopilotCarousel";
 import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/QueryCopilotFeedbackModal";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import "../images/CosmosDB_rgb_ui_lighttheme.ico";
 import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
 import "../images/favicon.ico";
@@ -63,8 +62,7 @@ initializeIcons();
 const App: React.FunctionComponent = () => {
  const [isLeftPaneExpanded, setIsLeftPaneExpanded] = useState<boolean>(true);
  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
-  // const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);
-  const shouldShowModal = useQueryCopilot((state) => state.showFeedbackModal);
+  const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);

  const config = useConfig();
  const explorer = useKnockoutExplorer(config?.platform);
@@ -127,8 +125,8 @@ const App: React.FunctionComponent = () => {
      {<QuickstartCarousel isOpen={isCarouselOpen} />}
      {<SQLQuickstartTutorial />}
      {<MongoQuickstartTutorial />}
-      {<QueryCopilotCarousel isOpen={true} explorer={explorer} />}
-      {shouldShowModal && <QueryCopilotFeedbackModal />}
+      {<QueryCopilotCarousel isOpen={isCopilotCarouselOpen} explorer={explorer} />}
+      {<QueryCopilotFeedbackModal />}
    </div>
  );
 };
--- a/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts
+++ b/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts
@@ -1,18 +1,17 @@
 export interface ParsedResourceTokenConnectionString {
-  accountEndpoint?: string;
-  collectionId?: string;
-  databaseId?: string;
+  accountEndpoint: string;
+  collectionId: string;
+  databaseId: string;
  partitionKey?: string;
-  resourceToken?: string;
+  resourceToken: string;
 }

 export function parseResourceTokenConnectionString(connectionString: string): ParsedResourceTokenConnectionString {
-  let accountEndpoint: string | undefined;
-  let collectionId: string | undefined;
-  let databaseId: string | undefined;
-  let partitionKey: string | undefined;
-  let resourceToken: string | undefined;
-
+  let accountEndpoint: string;
+  let collectionId: string;
+  let databaseId: string;
+  let partitionKey: string;
+  let resourceToken: string;
  const connectionStringParts = connectionString.split(";");
  connectionStringParts.forEach((part: string) => {
    if (part.startsWith("type=resource")) {
@@ -40,5 +39,5 @@ export function parseResourceTokenConnectionString(connectionString: string): Pa
 }

 export function isResourceTokenConnectionString(connectionString: string): boolean {
-  return !!connectionString && connectionString.includes("type=resource");
+  return connectionString && connectionString.includes("type=resource");
 }
--- a/src/Terminal/JupyterLabAppFactory.ts
+++ b/src/Terminal/JupyterLabAppFactory.ts
@@ -47,10 +47,6 @@ export class JupyterLabAppFactory {
  }

  public async createTerminalApp(serverSettings: ServerConnection.ISettings): Promise<ITerminalConnection | undefined> {
-    //Need to add this after we remove passing token through url
-    //const configurationSettings: Partial<ServerConnection.ISettings> = serverSettings;
-    //(configurationSettings.appendToken as boolean) = false;
-    //serverSettings = ServerConnection.makeSettings(configurationSettings);
    const manager = new TerminalManager({
      serverSettings: serverSettings,
    });
@@ -68,11 +64,6 @@ export class JupyterLabAppFactory {
      }
    }, this);

-    let internalSend = session.send;
-    session.send = (message: IMessage) => {
-      message?.content?.push(serverSettings?.token);
-      internalSend.call(session, message);
-    };
    const term = new Terminal(session, { theme: "dark", shutdownOnClose: true });

    if (!term) {
--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -1,6 +1,5 @@
 import { useCarousel } from "hooks/useCarousel";
 import { usePostgres } from "hooks/usePostgres";
-import { ParsedResourceTokenConnectionString } from "Platform/Hosted/Helpers/ResourceTokenUtils";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
 import { AuthType } from "./AuthType";
@@ -70,7 +69,6 @@ interface UserContext {
  readonly postgresConnectionStrParams?: PostgresConnectionStrParams;
  readonly isReplica?: boolean;
  collectionCreationDefaults: CollectionCreationDefaults;
-  sampleDataConnectionInfo?: ParsedResourceTokenConnectionString;
 }

 export type ApiType = "SQL" | "Mongo" | "Gremlin" | "Tables" | "Cassandra" | "Postgres";
@@ -159,4 +157,4 @@ function apiType(account: DatabaseAccount | undefined): ApiType {
  return "SQL";
 }

-export { updateUserContext, userContext };
+export { userContext, updateUserContext };
--- a/src/Utils/NetworkUtility.ts
+++ b/src/Utils/NetworkUtility.ts
@@ -18,10 +18,7 @@ export const getNetworkSettingsWarningMessage = (): string => {
  }

  // public network access is disabled
-  if (
-    accountProperties.publicNetworkAccess !== "Enabled" &&
-    accountProperties.publicNetworkAccess !== "SecuredByPerimeter"
-  ) {
+  if (accountProperties.publicNetworkAccess !== "Enabled") {
    return "The Network settings for this account are preventing access from Data Explorer. Please enable public access to proceed.";
  }

--- a/src/Utils/UserUtils.ts
+++ b/src/Utils/UserUtils.ts
@@ -6,9 +6,3 @@ export const getFullName = (): string => {
  const { name } = decryptJWTToken(authorizationToken);
  return name;
 };
-
-export const getUserEmail = (): string => {
-  const { authorizationToken } = userContext;
-  const { upn } = decryptJWTToken(authorizationToken);
-  return upn;
-};
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -1,13 +1,13 @@
-import { createUri } from "Common/UrlUtility";
 import Explorer from "Explorer/Explorer";
-import { getNetworkSettingsWarningMessage } from "Utils/NetworkUtility";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
+import { getNetworkSettingsWarningMessage } from "Utils/NetworkUtility";
+import { applyExplorerBindings } from "../applyExplorerBindings";
 import { AuthType } from "../AuthType";
 import { AccountKind, Flights } from "../Common/Constants";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
 import { sendMessage, sendReadyMessage } from "../Common/MessageHandler";
-import { Platform, configContext, updateConfigContext } from "../ConfigContext";
+import { configContext, Platform, updateConfigContext } from "../ConfigContext";
 import { ActionType, DataExplorerAction } from "../Contracts/ActionContracts";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { DataExplorerInputsFrame } from "../Contracts/ViewModels";
@@ -21,20 +21,19 @@ import {
  ResourceToken,
 } from "../HostedExplorerChildFrame";
 import { emulatorAccount } from "../Platform/Emulator/emulatorAccount";
+import { extractFeatures } from "../Platform/Hosted/extractFeatures";
 import { parseResourceTokenConnectionString } from "../Platform/Hosted/Helpers/ResourceTokenUtils";
 import {
  getDatabaseAccountKindFromExperience,
  getDatabaseAccountPropertiesFromMetadata,
 } from "../Platform/Hosted/HostedUtils";
-import { extractFeatures } from "../Platform/Hosted/extractFeatures";
 import { CollectionCreation } from "../Shared/Constants";
 import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
 import { Node, PortalEnv, updateUserContext, userContext } from "../UserContext";
-import { getAuthorizationHeader, getMsalInstance } from "../Utils/AuthorizationUtils";
-import { isInvalidParentFrameOrigin, shouldProcessMessage } from "../Utils/MessageValidation";
 import { listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { DatabaseAccountListKeysResult } from "../Utils/arm/generatedClients/cosmos/types";
-import { applyExplorerBindings } from "../applyExplorerBindings";
+import { getMsalInstance } from "../Utils/AuthorizationUtils";
+import { isInvalidParentFrameOrigin, shouldProcessMessage } from "../Utils/MessageValidation";

 // This hook will create a new instance of Explorer.ts and bind it to the DOM
 // This hook has a LOT of magic, but ideally we can delete it once we have removed KO and switched entirely to React
@@ -69,9 +68,6 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
  useEffect(() => {
    if (explorer) {
      applyExplorerBindings(explorer);
-      if (userContext.features.enableCopilot) {
-        updateContextForSampleData(explorer);
-      }
    }
  }, [explorer]);

@@ -413,31 +409,3 @@ interface PortalMessage {
  type?: MessageTypes;
  inputs?: DataExplorerInputsFrame;
 }
-
-async function updateContextForSampleData(explorer: Explorer): Promise<void> {
-  if (!userContext.features.enableCopilot) {
-    return;
-  }
-
-  const url = createUri(`${configContext.BACKEND_ENDPOINT}`, `/api/tokens/sampledataconnection`);
-  const authorizationHeader = getAuthorizationHeader();
-  const headers = { [authorizationHeader.header]: authorizationHeader.token };
-
-  const response = await window.fetch(url, {
-    headers,
-  });
-
-  if (!response.ok) {
-    return undefined;
-  }
-
-  const data: SampledataconnectionResponse = await response.json();
-  const sampleDataConnectionInfo = parseResourceTokenConnectionString(data.connectionString);
-  updateUserContext({ sampleDataConnectionInfo });
-
-  await explorer.refreshSampleData();
-}
-
-interface SampledataconnectionResponse {
-  connectionString: string;
-}
--- a/src/hooks/useNotificationConsole.ts
+++ b/src/hooks/useNotificationConsole.ts
@@ -5,26 +5,21 @@ export interface NotificationConsoleState {
  isExpanded: boolean;
  inProgressConsoleDataIdToBeDeleted: string;
  consoleData: ConsoleData | undefined;
-  consoleAnimationFinished: boolean;
  expandConsole: () => void;
  // TODO Remove this method. Add a `closeConsole` method instead
  setIsExpanded: (isExpanded: boolean) => void;
  // TODO These two methods badly need a refactor. Not very react friendly.
  setNotificationConsoleData: (consoleData: ConsoleData) => void;
  setInProgressConsoleDataIdToBeDeleted: (id: string) => void;
-  setConsoleAnimationFinished: (consoleAnimationFinished: boolean) => void;
 }

 export const useNotificationConsole: UseStore<NotificationConsoleState> = create((set) => ({
  isExpanded: false,
  consoleData: undefined,
  inProgressConsoleDataIdToBeDeleted: "",
-  consoleAnimationFinished: false,
  expandConsole: () => set((state) => ({ ...state, isExpanded: true })),
  setIsExpanded: (isExpanded) => set((state) => ({ ...state, isExpanded })),
  setNotificationConsoleData: (consoleData: ConsoleData) => set((state) => ({ ...state, consoleData })),
  setInProgressConsoleDataIdToBeDeleted: (id: string) =>
    set((state) => ({ ...state, inProgressConsoleDataIdToBeDeleted: id })),
-  setConsoleAnimationFinished: (consoleAnimationFinished: boolean) =>
-    set({ consoleAnimationFinished: consoleAnimationFinished }),
 }));
--- a/src/hooks/useTabs.ts
+++ b/src/hooks/useTabs.ts
@@ -11,8 +11,6 @@ interface TabsState {
  activeReactTab: ReactTabKind | undefined;
  networkSettingsWarning: string;
  queryCopilotTabInitialInput: string;
-  isTabExecuting: boolean;
-  isQueryErrorThrown: boolean;
  activateTab: (tab: TabsBase) => void;
  activateNewTab: (tab: TabsBase) => void;
  activateReactTab: (tabkind: ReactTabKind) => void;
@@ -26,8 +24,6 @@ interface TabsState {
  closeReactTab: (tabKind: ReactTabKind) => void;
  setNetworkSettingsWarning: (warningMessage: string) => void;
  setQueryCopilotTabInitialInput: (input: string) => void;
-  setIsTabExecuting: (state: boolean) => void;
-  setIsQueryErrorThrown: (state: boolean) => void;
 }

 export enum ReactTabKind {
@@ -44,8 +40,6 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
  activeReactTab: ReactTabKind.Home,
  networkSettingsWarning: "",
  queryCopilotTabInitialInput: "",
-  isTabExecuting: false,
-  isQueryErrorThrown: false,
  activateTab: (tab: TabsBase): void => {
    if (get().openedTabs.some((openedTab) => openedTab.tabId === tab.tabId)) {
      set({ activeTab: tab, activeReactTab: undefined });
@@ -157,10 +151,4 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
  },
  setNetworkSettingsWarning: (warningMessage: string) => set({ networkSettingsWarning: warningMessage }),
  setQueryCopilotTabInitialInput: (input: string) => set({ queryCopilotTabInitialInput: input }),
-  setIsTabExecuting: (state: boolean) => {
-    set({ isTabExecuting: state });
-  },
-  setIsQueryErrorThrown: (state: boolean) => {
-    set({ isQueryErrorThrown: state });
-  },
 }));
--- a/test/sql/resourceToken.spec.ts
+++ b/test/sql/resourceToken.spec.ts
@@ -39,7 +39,7 @@ test("Resource token", async () => {
  await page.type("input[class='inputToken']", resourceTokenConnectionString);
  await page.click("input[value='Connect']");
  await page.waitForSelector("iframe");
-  const explorer = await page.frame({
+  const explorer = page.frame({
    name: "explorer",
  });
  await explorer.textContent(`css=.dataResourceTree >> "${collectionId}"`);