Kill off some cruft (for real this time)