Cleanup of demos, made work without textures