remove unwanted code in ver2.0