Refactored: remove code clone refs #191