cleanup of auto interpolation