Remove None from enum values