Timeouts, Demo Mode, Removed Legacy Code