Remove unneeded demo and update todos