removing sorting stuff for now