[170048] constants cleanup
4 files changed