Removing stuff that is probably no longer necessary.