Revert "lots of skelly-skoo code"

This reverts commit 285cb13072accd032f681d117e3bb2b2bcd4346a.