Delete more crap
Merge pull request #2 from pboyer/coresplit2

Delete more crap