Missing one part of the cleanup