Remove duplicated line
Amend commit according to Robert's comments