Move more attributes to new checker; Drop more legacys