init-selection removed as it is no longer needed