TODOs to be resolved once in demo

This reverts commit 19d9b391ed0fd123870992977605b20aadc6e223.