suffix_string calls deleted

- suffix_string is not required anymore
- preperation for re-base