Clean up map implementation