Fixed issue #171 and #174

#171
Fax number being required

#174
Driver code is removed.