Clean up interpolation code