more cleanup for pr