Deleted duplicated code after merge