Some cleanup on unused map urls and a regression bug from last commit.