Remove leftover templates; update mapping file