Finalize map addition and cleanup