Removing obsolete unmap calls