Hydraulic Solutions Framework (remove)