Update 6.9

Cleaning up