Added suffix handling to feature duplicated discovery
Code cleanup from last commit