693 PR clean-up