weil-mclain wtgo-3 boiler setup

duke_2

I find I have to redo the piping on my boiler. In reading through the documentation it appears whoever set it up initially had the system setup as both a boiler and a tankless water heater. I do not need the tankless setup. Is this something I can just remove? also, I have a diaphragm tank coming off the boiler feed. It is connected to a flow-control valve. Next to this, there is a air vent on the top of the boiler. Is this a correct setup? The manual shows me conflicting information on this point.