Working on cleanup.