Removing prefix hardcoded