Remove leader-s mapping
Reorganize leader section