[minor] misc cleanup