Clean up some reminder code
Merge in changes from Ticker0086