Fuel pump not working on my 2017 500S. Want to replace but having difficult time removing plastics from around tank. I have the two lower side plastics off. Anyone know a easy way to remove the top plastics?

Tank shroud has two plastic pins in the area where the front of the seat and tank area meet. Once you remove the seat, you see them both on the edge. They must be removed, then the two other pins in the front of the tank shroud , under the black instrument panel trim that is mounted on the handle bar, remove them, then slowly lift up the tank shroud in the back and it will lift out the right and left plastic studs that fit into rubber grommets on each side.if you have the lower plastics off already, this should ease you effort. Also, gas cap off during this removal. Mind you, I have a 500 HO EPS 2017 model but, I would guess this area should be identical.