Cleanup + us -> s for pollPeriod