comment and remove unwanted code