cleanup effort 1