Cleaned up autoloading
Removed DeferredSnapshotTaker, not useful at the moment