cleanup base change code