1.62.13.0

Cleaning up code