MNT : removed now un-used function
MNT : simplified function