Cleanup based on commits from initial PR