some light cleanup not user impacting