lotsa cleanup