added helper class, types and renovated RemoveTM