Remove bug fixes as they don't work