final cleanup for PR