Some summer cleaning