Hotfix: Remove constantes usages