Converted most leader-maps to non-leader maps