Removed the demo
Removed some deprecated stuff + cleanup of files