Update to latest critical
Cleanup some more