Revert "Orca Tools Overhaul (may revert)"

This reverts commit 67ba4f4729c9e5dc6593a1eff13c5b6b3bd68bd9.