Removed unused code, driver issue fixed