Cleanup. Added custom root support