Small code removal