c86aeab remove now unused code