Changes:

• Removing Legacy UI Code