Cleanup from last week of commits