WINDUP-102: Fix formating, Remove whitelist