ToR 21.003

Cleaning up of Part 21 and AMC/GM