Revert "Quick changes for demo"

This reverts commit d7921517b59ba5bf145caed8184ae34b4e9d4838.