Remove #if template to test out map