Remove hotfixes