PIM-837 : Do some clean up on variant feature and code