Revert "Code adapted to Eversnap requirements"

This reverts commit 94f2d07edfcb9b71142f0b6589bb6087e66c74fa.