Hotfix cleanup