Remove unused codes and comments