Remove unneeded lines, update and add other values