Hotfix/remove placeholder data