Modified demo restart

Cleaned up some duplicated code associated with the demo restart.
Cleared timer when demo is stopped.