Got rid of everything we don't use any more