Fixes: #2397 Cleaned functions.inc
Fixes: #2397 cleaned SnapshotHandler