Remove a hacky buffer extraction from metadata