remove hotfixes from code