remove old oarlock helmsman workaround