Revert "Add UC Values"

This reverts commit 6b9c262301eb563534117e32501e20207b0fa15b.