cleanup redundant folders and remove whitelister