Removing more things I don't use