cleanup and baseline update