Revert "Several code enhancements"

Reverts AppliedEnergistics/Applied-Energistics-2#509

Forgot to squash