Got rid of some nonsense for some better nonsense.