Last bits and pieces of the cleanup