Removed supervoxel changes from branch, switched to using macro for instantiation