Remove cx23885 stuff