I hold a lot of water if I’m not careful, so for me I take some arimidex if I’m getting too bloated. I reduce sodium and carbs (especially before bed). Stage guys use all kinds of weird tricks including diuretics. I know there are some over the counter diuretics out there, but I wouldn’t mess with them personally.
I wouldn’t overthink things, just make small changes and notice how your body reacts over each week. Btw did you get the surgery already?