FIX: Drawer cleanup in Scene