Feature/ch3 cleanup