Removed unsafe enum usage from everywhere else