Got rid of a few unused things.