Remove uneeded directories.  CPU performance module changes.