Move more take logic to helper classes.
Remove more fucntions.