clean up picker code