v1.0.31 More code cleanup