Cleanup map interface