Clean up SelectableHolder API