clean and use new interpolation component