Remove even more spork stuff.