Removed broken upload code
Fixed timezone issues