Misc Cleanup post release