Cleanup DateTime use to prevent timezone troubles