Check in changes that doesn't quite work yet.
undo changes related to cloud storage
Delete the file left-over in the previous clean-up commit.
Instead of ignoring InterruptedException, return when the exception is thrown.
Do not track calls if tracking is disabled.