Revert "More junk in the trunk clean up and Spelunk"

This reverts commit 89508172254c0f135e0a6afbf9dbaea86399258a.