root: general cleanup