Fix comments and remove unneeded fields