Cleanup root

belated Cleanup root