Remove hardcoded prefix