Removal of GhostDriver code & related errors