Remove unsused helper class