Remove things that I think we don't need