safer/easier to take tank off now before you start messing with the rest?

good luck with it tho