Removing more unnecessary junk