Remove hotfix