Remove hardcoded value