more cleanUp changes