Remove more pointless maps