clean out some old code, fix links to new struct