Remove unecessary interpolation