a42root: Code cleanup