[BUGFIX] Constants cleanup