More Cleanup

Remove Dateutil, externalize some strings