cleanup
timezone removed