Update snapshot test, remove lots of unused code