Additional cleanup and consolidation, removed unneeded files