#81 Changed whitelist json. Removed some unneeded code