James C - clean out unused files, refactor