one more clearInterval to make sure we're consistent
Merge branch 'staging' into production