Clean up demo project.
Fix bug when custom timeout interval isn't set.