Misc release related cleanup