Simplifications of conductivity code