Some code cleanup
Update for 0.98.13