Might be good to delete some of this commented-out stuff now? Except perhaps in cases where we think it likely that we would want to reinstate (part of) it?