DAR-1485 | UI Drawer code cleanup