removed old helper class