Remove hardcoded values [3RC1]