Remove unnecessary constants