Remove an erroneous reference to a map variable from function calls not requiring it