Removed anything that isn't my change. Saves me the headache of setting passwords and secret keys manually.