Some cleanup and removal of service creds.