#226 remove last remaining calls to System.currentTimeMillis()