Reorganize unused old code.