Clean up tag map generation