couple cleanup updates