Removed some pointless functions in the demo