Removed supervoxel changes from branch
Changed to using macro for instantiation