Clean up TODOs and demo