cleanup of generic strategy reuse scheme, ref #80 #81