Remove helper class