Remove cx231xx stuff