Added cleanup and whitelist capability