Update on driver, removed debug logging and cleanup