Simplify salt module

Change-Id: I228b3294022efa391f0f79353ac1db8a2f8f35f4