Thanks omegatron, I checked and watermarking is disabled.
I will do a final check through the config file and the 'settings' table for the data dir settings. But I didn't find any thing before..
After that - I'll do the upgrade and see what we're left with
