Code cleanup, unused variables and comments.
Code cleanup, unused variables and comments.

pyrochlore/cycles,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,pyrochlore/cycles,pyrochlore/cycles,tangent-opensource/coreBlackbird