Clean-up pyon code
Clean-up pyon code

crchemist/scioncc,ooici/pyon,ooici/pyon,scionrep/scioncc,scionrep/scioncc,mkl-/scioncc,scionrep/scioncc,mkl-/scioncc,mkl-/scioncc,crchemist/scioncc,crchemist/scioncc