Removed unnecessary code and fixed mistake in Driver