Remove extract, fix SNAFU