Removed some cruft. make check still doesn't pass.