Fix regression introduced in previous cumit, and remove more useless stuff