cleanup was somehow not added in previous commit