Check for unused dirs
refactor a bit salt & mastersalt states