misc cleanup for real release