In short, yes. I also think that the range of activities covered by criminal law should be greatly reduced, e.g. possession of potentially dangerous pharmaceuticals should not be something people are imprisoned for.