Get rid of custom getter in Map controller that's no longer necessary