Removed old Drawer class