Remove unnecesary options and add comments