-Lengthen the fields
-Remove unused line