Also remove the duplicated oaktrail function.
Signed-off-by: NPatrik Jakobsson <patrik.r.jakobsson@gmail.com>