Map IO code cleanup