All came off soo easy. I did not have to remove tank!
Ordered the OEM caps from Bikebandit $3.49 each.
Ahhh feel better now ;]