Revert "these files for later combining somehow"

This reverts commit 545bec87b8c7d86438743086ed51b3beadf381e2.