Removing Ying's code