Clean up selection support