delete unneeded codes and comments