constant usage has been refactored slightly and unused constants have been removed
Authored by: madelmann 2020-02-01
Parent: [r2622]
Child: [r2624]
