Update to SF 2.4 and remove as many deps as possible.