Fix things mostly by removing code