Removed configuration dependent suffixes.