Unused code removed
Issue "Code duplication" reviewed