Remove old OneClick orphan code for #61