remove skip save pwd parameter -- not used any longer
Small cleanups
Don't hardcode strings, use constants instead

This hopefully reduces the chances for
regressions during refactoring.