Remove some uncessary codes and comments