Some various cleanup