Remove 'counter' occurences in pipeline

Change-Id: I6f8c93b30c068811e88f7afcbebb45e61606ffd2
Blueprint: remove-counter
Merge "Remove 'counter' occurences in pipeline"