Further cleanup TMFCore's code

Lightly tested on the `war` repository.