Remove explicit enum numberings