Remove half-baked and unused stuff.