Remove unneded fixes