more cleanups
More info