Removed defunct _gateway property from Mapper and tests.