Clean up root a bit