Add more changes to the driver to remove unneccessary fields