cleaned up old picker code