FIX: Issues with demo leftover from routing