Removing more unneeded things.