Clean up unused stuff a bit