Easier loading

* Removed demo

Signed-off-by: Oz Ramos <>