Remove unnecessary metadata map