Got rid of unneeded shit