kleanups & more kleanups