Clean up pick logic