removed MNP related codes