Removed helper class