[#690] WIP - Remove unused constants