* Removed invalid duplicated code