UI - Work in progress - Removed unused ref