Some code simplification based on new assumption that all new-style experiments will have templates.
Some code simplification based on new assumption that all new-style experiments will have templates.

addrummond/nodeibexfarm,addrummond/nodeibexfarm,addrummond/nodeibexfarm