Removing unnecessary interpolation