2nd cleanup commit