Removed db passwords
Resolved variable conflict