Removed metadata tracking