Removal of non public Pair sun class