Oh yes, that is the main reason for removal, there is probably +/- 2-3mm of movement on the crankset and a horrible clicking sound.
Many thanks for everyone pitching in.
I just looked at the Park Tool FR2C which has pins at 25mm and would probably fit but if it isn't designed for the stresses...