Clean up of driver and Data Map Plugin