Clean up stuff from previous duplication solution attempts