Remove cruft and update for linux-ipipe 3.8