Cleanup for 2 release