Got rid of unneeded things