cleanup unused stuff everywhere