refactoring - remove duplicated references