Remove unwanted hardcoded prefix and suffix