UTC stuff and cleanup