Major cleanup for hale PR