remove restore's call to server and beef up security