Revert "Test UI Class"

This reverts commit 40012ddb2db697849f81bd98368583675efcbc93.