TMI-CORE: Code clean-up.