Clean some code, update Messages.json, fix assert request.