Release 3.6.16 Cleanup