Removed hotfixes