Remove old code. Something is still not right here with smoothing not
even.
Former-commit-id: 9d3cfbe7b8bb780564f23c21a1576ea072a56db3
Former-commit-id: 208531f503fd3e5d08b29175542838f4777822be
Former-commit-id: e02cdc5ad7b784722d761678b442589962a4177f