Remove CE and few other fixes