hotfix: cleanup previous hotfix hhh