Revert "Making changes to non-ideal transport and kinetics"

This reverts commit 034c7f54313c420e3a0f3ff4c5326e3fb2591958.
Revert "Revert "Making changes to non-ideal transport and kinetics""

This reverts commit b3afe4bc053fc3ee23e8a7de2e2e9223fa69719d.
Tidying up some etiquette issues from previous commit.