cleaning up from last summer...