Dropped unneeded helper class