Re-added the 'unneeded' prefix and sufix removal