Eliminated .metadata binary and index files
More cleaning up