Remove fixes not needed anymore