That is correct.
Stuff will be removed, and I'll update both the demo and patreon version around that time.
