Remove "DefaultComponents"
There is a property system mechanism to use fluid systems. However this lead to unwanted dependencies and is not even more convenient and a lot less transparent.
Find the code where fluid systems are used through this mechanism and replace it by using the fluid system directly.