cleanup
removed maps and fixed date parsing