Got rid of some straight up nonsense