Clean up some old and unused stuff