Removed the unneeded prefix and sufix removal