Remove unused stuff, #22