removed deprecated ENUMs