Forgot to remove commented map calls