Copying over some previous work, removing the demo bundle