Removing credentials, moving to env vars