Some cleanup
Huge amount of checks for whether the free surface is enabled.
Move some stuff for scoping reasons