Removed unused code, added demo loader