[642] Small cleanup commit