Removed unused field
Use strings rather than create dates wherever possible