Remove smoothing code from main branch