remove hardcoded references to map variable.