Removing some of the unneeded old code.