Cleanup password related stuff