Michael's clean up update + testPeriodic