Some patches from hch@infradead.org cleaning up sn2 code a bit,
including the removal of some unnecessary files.