More clean up; remembering how this works