partial cleanup with collections