cleaned up ICredential. #305