Removing unused samfile class, more code cleanup