I made a YouTube video on removal of water pump and thermostat for z4s with n54 in them. Its my way of doing it I’m sure there are thousands of easier or faster ways but I thought it would be good to document. https://youtu.be/Okv0DvOk88Q?si=jmPZca_9wMYExiPF