TMDM-8055: Chore cleaning