Fix and remove more things