Removed duplicate class constants and made L1ClassId the sole authority.