TSP-5673 / TSP-5236: delete fully merged subtask branch

maybe we could move the headers (which are also used in other methods) somewhere else