Adding removeDataset and _getDrawer and relevant drawer