remove/add necessary comments