Removed unused code
Migrated more unit tests to OCaml