gray and some more work on stripping timezone