clear wrong code
First stage of Merge with upstream