First pass at cleanup for PR merge