Revert "More cleanup"
Revert "More cleanup"

This reverts commit 97879ffae0de40c0d4f5b9e078b2141e75d34b8a.

23Skidoo/snap-server,snapframework/snap-server,23Skidoo/snap-server,snapframework/snap-server,snapframework/snap-server,23Skidoo/snap-server,sopvop/snap-server,sopvop/snap-server