removed salt centric stuff