Remove declarations for removed code