Remove offset code